added music and moved some maps around
fixed movement changes
Added more weapons
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer
Added armor to the character
Added functionality to switch between weapons and shields
Merge branch 'developer' of https://github.com/jcollins2014/Project into hao

Conflicts:
	Assets/Scenes/GameScene.unity