level
Merge branch 'development' into pygame

Conflicts:
	MusicShowdown/data/level1.png
Super Safe Demo
Dope pants
player
merge lool
DOPE ART YO
player
polishworks
demoshit
fixed demo
fixing demos
i gotta commit this
Merge branch 'pygame' of https://github.com/Paraximia/IndianOstrich into pygame

Conflicts:
	MusicShowdown/player.pyc
updating 123.txt
Merge branch 'pygame' of https://github.com/Paraximia/IndianOstrich into pygame
boo
idk
rescaling mackle
merging