polishes a lot of stuff up
Merge branch 'master' of https://github.com/Yacob/mario

Conflicts:
	Assets/__Scripts/Mario.cs