Merge branch 'master' into david4
Merge branch 'david3' into david4
Merge branch 'bea' into david4
Merge branch 'david3' into david4
Various changes.
Merge branch 'david3' into david4
Merge branch 'Ar' into david4

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