Added attacks
Merge branch 'alananddayvid' of https://github.com/duke-compsci308-spring2013/vooga into alananddayvid

Conflicts:
	src/games/fighter/davidalan/controller/levels/StreetFighterOneVOneController.java