added class to control what weapon in available and made minor changes
to baseball bat and laser gun weapons
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git
Added the current location of the player to the mini-map
Trying to resolve conflicts
Commented back in testCreate
Merge branch 'master' of https://github.com/ProfAmesBC/Game2013.git