r
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
cleaned up some comments and method descriptions.

fixed a bug in level2.java that caused the app to crash when changing the projector screen
Merge remote-tracking branch 'origin/master'