client code
Merge branch 'master' of https://github.com/bl275/cardsagainstacm

Conflicts:
	CardsAgainstACM!/res/layout/activity_loading_screen.xml
	CardsAgainstACM!/src/com/example/cardsagainstacm/LoadingScreen.java