fingers crossed that I don't overwrite the new stuff.
Merge branch 'master' of https://github.com/temogen/CS340-CourseProject

Conflicts:
	CS340CP.pro
	Enemy.cpp
	PirateAdventure/PirateAdventure.pro
	PirateAdventure/PirateAdventure.pro.user.5c26285
	PirateAdventure/mainwindow.cpp
	PirateAdventure/mainwindow.h
	PirateAdventure/maphero.cpp
	PirateAdventure/maphero.h
	PirateAdventure/worldmap.cpp
	PirateAdventure/worldmap.h
	PirateAdventure/worldmap.ui
	attackmove.cpp
	attackmove.h
	main.cpp
	mainwindow.cpp
	mainwindow.h
	shotgun.cpp
	shotgun.h
	xgun.cpp
	xgun.h
errors