Have to commit to get synced
Merge branch 'master' of https://github.com/Pancia/ucsc-hacksassins

Conflicts:
	src/main/java/com/turingsarmy/hackathon/PlayActivity.java