flag pick up and reset!
Merge branch 'master' of https://github.com/maxlapides/capture-the-flag

Conflicts:
	public/js/game.js