hi
Merge branch 'master' of https://github.com/maxlapides/capture-the-flag

Conflicts:
	public/js/components.js
	public/js/game.min.js