committing partial implementation of stuff b/c git won't let me pull
with them in this state
Merge branch 'master' of https://github.com/nzoelle24/RaceToTheBottom

Conflicts:
	Site/WebContent/js/gameProxy.js