1 ranged, 1 melee weapon added to arsenal
minor changes to sword
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git

Conflicts:
	minimap.png
deleted minimap