Fix merge conflicts

[3501/stronghold-2016] / notes / niyati.org

diff --git a/notes/niyati.org b/notes/niyati.org
new file mode 100644 (file)
index 0000000..679a02b
--- /dev/null
+++ b/notes/niyati.org
@@ -0,0 +1,6 @@
+TODO:
+Put a boolean constant in Constants like usePhotogate and a method in shooter that changes / toggles the constant(constant=!constant)
+
+-shooter should have two versions one uses photogate and one does not 
+    - one that does use photogate tests for ballInside and then shoots
+- one that doesn't does not use this test.