updating should work now
Merge branch 'master' of github.com:krzychukula/hungergames

Conflicts:
	views/shoot.hjs