Merge remote-tracking branch 'origin/Ar' into david4
Merge branch 'bea' into david4
Merge remote-tracking branch 'origin/bea' into bea
Merge branch 'david3' into david4
Merge remote-tracking branch 'origin/bea' into david4
Merge remote-tracking branch 'origin/bea' into bea
Merge remote-tracking branch 'origin/bea' into david4
Merge branch 'david3' into david4
Merge branch 'david3' into david4
Merge branch 'david3' into david4
Merge branch 'david3' into david4
Merge remote-tracking branch 'origin/master' into bea
Added pop up for board size. Working for single player
Minor clean up
Merge branch 'david3'
Merge branch 'master' into bea

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