Merge remote-tracking branch 'origin/master'

Conflicts:
	Senior Project/SeniorProject/SeniorProject.v11.suo
	Senior Project/SeniorProject/SeniorProject/GameEngine.cpp

Updated Hover Information ++

Updated end turn button - not clickable
unless in play phase.

First player game board does not highlight on
spaces u can't place
units.

Can not place unit's on gold mine
locations.

Added warrior ability images and hover images.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Senior Project/SeniorProject/SeniorProject.v11.suo
	Senior Project/SeniorProject/SeniorProject/GameEngine.cpp
Trying to get synced!
Merge branch 'master' of https://github.com/Justin-Lockridge/GSP494

Conflicts:
	Senior Project/SeniorProject/SeniorProject.v11.suo
	Senior Project/SeniorProject/SeniorProject/GameEngine.cpp