commit
final gps changes
Master Mind Game is now working!

TODO need to figure out server when Anthony gets here
Merge branch 'master' of https://github.com/Pancia/hackathon into CGravelBranch
challenges
COLORS
MORE COLORS
Done With colors
RPS colors
Fixed things
clickable non-college zones
Merge branch 'master' of https://github.com/Pancia/hackathon into CGravelBranch
Game Logic
updates
Works on tablets now! Yay!

Changed the layout for activity_main.xml to make it work. Doesn't look
as nice without the side margins. If anyone know how to fix that please
do. Thanks.
Added instructions for Master Mind
Partially fixing pvp logic
More updating and fixing
Merge branch 'master' of https://github.com/Pancia/hackathon

Conflicts:
	src/main/java/com/turingsarmy/hackathon/PlayActivity.java
Fixing and upgrading Server