updates some things
Merge branch 'master' of https://github.com/Yacob/mario

Conflicts:
	EECS494-W14-A1-AndersonLuke_NestorJacob/EECS494-W14-A1-AndersonLuke_NestorJacob.unity3d