No changes.
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4

Conflicts:
	SpringGameJam/SpringGameJam.sdf
	SpringGameJam/SpringGameJam.suo
No change.
Pushing at Grant's request
Merge branch 'master' of https://github.com/gwalker91/GJSpringTeam4