Merge branch 'Ar' into david4

Conflicts:
	sosgame1/src/com/example/sosgame1/controller/LogicControl.java

Fixed the conflicts by copying the entire file from the right pane of
the merge tool into the left pane, then saving the left pane with CTRL-S
and finally doing Team > Add to Index
testing
Trying to fix arraylist modification error.
Added logic checking to this branch. Should now be same as david4 branch.
Merge branch 'david4' into david3. Not really. Should merge the other way.

Conflicts:
	sosgame1/src/com/example/sosgame1/MyGLSurfaceView.java
	sosgame1/src/com/example/sosgame1/controller/LogicControl.java