attack fixes
merge
Merge branch 'master' of https://github.com/AndrewGnagy/robogame

Conflicts:
	battle/js/robotclass.js