Merge remote-tracking branch 'origin/bea' into bea
Merge remote-tracking branch 'origin/bea' into bea
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
Merge remote-tracking branch 'origin/david4' into bea
Deleted background on settings page.
Deleted background on settings page.
Merge branch 'bea' of https://github.com/MSDAssignment3/sosgame1.git into bea
Score now updates in the interface. the LogicControl constructor has
been modified, it now accepts the MainActivity as well
When the board a pop up prompts that the game has ended and gets the
winners name as well as save the score on the DB
Scores are now properly saved in DB with the name of the player. I'll
put a link of the screenshot of the DB's content on the commit's
comments.
Added a few line for showing score, but still not working.
Merge remote-tracking branch 'origin/bea' into peter

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