Wont let me update until i commit

fucking hate you github
Merge branch 'master' of https://github.com/NerdShame/Farts

Conflicts:
	Farts.capx
	Farts.capx.autosave