Added more weapons
Merge branch 'developer' of https://github.com/jcollins2014/Project into developer
Added armor to the character