fmt
Merge branch 'master' of github.com:wyndwarrior/HackSC

Conflicts:
	node/public/js/main.js