got weapon upgrading working correctly
uncapitalized laser1.png to avoid problems where OS != OSX
Implemented the minimap
Implemented the minimap
Merge branch 'dhakimian' of https://github.com/masonnl/softDev into dhakimian

Conflicts:
	src/Laser.cpp
	src/MovingObject.cpp
Implemented the minimap
Merge branch 'master' into dhakimian