merging
Merge branch 'master' of https://github.com/jdtang13/SeniorSpringVideoGameProject

Conflicts:
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGameContent/Graphics/Backgrounds/island.png
	SeniorProjectGame/SeniorProjectGame/SeniorProjectGameContent/Graphics/UnitTextures/unitSample.png
fixing
Merge branch 'master' of https://github.com/jdtang13/SeniorSpringVideoGameProject into lionel