better attacking
Merge branch 'master' of https://github.com/douglascalhoun/barfstorm

Conflicts:
	js/main.coffee
	js/main.js
	js/main.map