stuff
Merge branch 'master' of https://github.com/bflaherty88/CMP-150-Final

Conflicts:
	Final Project/Assets/Scripts/Platformer.cs