I had some uncommitted changes apparently
Merge branch 'master' of https://github.com/TheRooster/SLB

Conflicts:
	src/flash/classes/edu/ewu/components/attacks/Attack.as
	src/flash/classes/edu/ewu/components/player/LocalPlayer.as
	src/flash/classes/edu/ewu/components/player/Player.as
	src/flash/classes/edu/ewu/networking/NetworkManager.as