Merge remote-tracking branch 'origin/master'

README.md

@@ -1,2 +1,11 @@
 # Calculator
 CS193P Winter 2017 Assignment I: Calculator
+
+This is work in progress.
+
+Some notes:
+- Please look at the Issues section to check which tasks are completed and which ones are still open. When a task is completed, a tag is created.
+- Some information about a chosen solution is documented in the Wiki section
+- A Test Driven Development approach is followed when possible
+
+Environment: Xcode Version 8.2.1 (8C1002) running on macOS Sierra 10.12.3 (16D32)