Merge remote-tracking branch 'cfinch2/master'
few comments and changes
Merge remote-tracking branch 'jcoady9/master'
Merge remote-tracking branch 'cflinch2/master'
moved fakedatabase to the Controllers project. Updated IDatabase to have
the getUser method. Added the GetUserController class. Created and began
implementation of DatabaseApp
fixed small bug in LoginController
Merge remote-tracking branch 'sbonner1/master'
added a controller and button to test connectivity to database
imported jackson (JSON implementations) libriaries so JSON will work.
minor changes, some javadoc comments.
Merge remote-tracking branch 'jcoady9/master'
stuff
Merge remote-tracking branch 'sbonner1/master'
added some images to test gridview
created a working image button in the GameScreen Activity
Enable changing of image when image button in GameScreenActivity is
clicked.
Merge remote-tracking branch 'jcoady9/master'