fucked up
Merge branch 'master' of https://github.com/GunTeam/Pastel-2

Conflicts:
	pastelFollower.spritebuilder/Packages/SpriteBuilder
Resources.sbpack/MainScene.ccb