Final Update move back to master
Merge branch 'Unity-Port' of https://github.com/DaedricWolf/Platformer into Unity-Port