Changes to swordplay and hud
Merge branch 'master' of https://github.com/eckerdj1/Games2FinalProject

Conflicts:
	Game2/Game2App.cpp