Merge remote-tracking branch 'origin/master'
Merge branch 'david3'
Merge branch 'david3'
Merge branch 'david3'
Merge branch 'david3'
Merge branch 'david3'
Merge branch 'david3'
Added pop up for board size. Working for single player
Finally (I think) got the back button handling working properly.
Merge remote-tracking branch 'origin/master' into david3
Merge branch 'david3' into peter

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java