Minimal, not-really-working UI
Merge remote-tracking branch 'origin/UIDesign'

Conflicts:
	app/src/main/java/fakesetgame/seniordesign/GameScreen.java
	app/src/main/res/layout/game_activity.xml
Resolved using files from UIDesign branch
Updated to reconcile merged code with previous changes in master