Usual Commitment.
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/SpringGameJam.sdf
	SpringGameJam/SpringGameJam/Debug/SpringGameJam.log
	SpringGameJam/SpringGameJam/Debug/SpringGameJam.vcxprojResolveAssemblyReference.cache