Fixing and upgrading Server
Fixed Server, playing RPS works!
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
Upgraded json response handling

Made the onComplete future task callback from AJRM a lot cleaner and now
reflects upgrade in json formatting on the server.
Merge remote-tracking branch 'origin/master' into Rachelle
Merge remote-tracking branch 'origin/anthony' into Rachelle

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