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

Conflicts:
	sosgame1/src/com/example/sosgame1/MainActivity.java
Merge remote-tracking branch 'origin/david4' into bea
Deleted background on settings page.