login stuff
stuff
Merge remote-tracking branch 'sbonner1/master'
implemented a controller to get the highscores from the database
merge-conflicts resolved

Merge remote-tracking branch 'sbonner1/master'

Conflicts:
	FinalProjectControllers/src/edu/ycp/cs496/ghosts/servlets/DatabaseApp.java
testing github
Integrated Chris's 2D graphics code into the project app. The activity
for the game play has bee changed from the GamePlayActivity to the
MarbleMadness activity (name pending change). We now have a game screen
where sprites move around the screen instead of a grid based game.
Merge remote-tracking branch 'sbonner1/master'
modified controllers to get the users' highscores
database changes
Merge remote-tracking branch 'sbonner1/master'
removed controller that tested connectivity between the app and server.
Also removed the button from the main activity's UI to use this
controller.
removed logging code from the HighscoreController.
forgot to delete the TestController in the previous commit. It is now
deleted.
Merge remote-tracking branch 'sbonner1/master'
pulled database changes from Shane
Merge remote-tracking branch 'sbonner1/master'
modified the usage of the HighscoreController in PlayerInfoActivity so
that retrieving the highscores from the server would not cause the app
to crash.
added log.i to HighscoreController to debug through Logcat
fixed issue with being unable to access server for users' highscores.
The client can now retrieve this information from the server.