Fix headers in HR. Made punch guy actually shoot.
Merge remote-tracking branch 'origin/master'

Conflicts:
	villain.js