Added melee unit functionality

-Added golem units
-Updated collision for new units
-Able to hit 1st player if goldmines are destroyed
Merge branch 'master' of https://github.com/Justin-Lockridge/GSP494

Conflicts:

	GameEngine.cpp
	GameEngine.h