Replace with yuri's buttons
Refactor commitAttack to include smacktalk argument
Added smacktalk
Merge branch 'master' of github.com:pencilcheck/PvP

Conflicts:
	app/views/game/fightScene.html