Intermediate Checkin

My computer blue-screened and fucked my repo, so I'm committing
everything I have before I clone. Likely does not build.
Actual Check-in

Options screen actually does things now, and it's connected to the game.
Prettified Main Menu

Hopefully improved options menu by Wed
Added TODO note
Fixed some unit tests
Home and Game screen

changed home screen UI and began implementing time attack option
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/fakesetgame/seniordesign/HomeScreen.java
	app/src/main/res/layout/home_activity.xml
	app/src/main/res/values/strings.xml
Time attack fix

fixed time remaining so game ends when time runs out
Use Preferences For Our Settings
Merge remote-tracking branch 'origin/master' into backend
Modifying backend to suit game needs
put appengine-web.xml back into repo