to pull again
Merge branch 'development' of https://github.com/Paraximia/IndianOstrich into development

Conflicts:
	MusicShowdown/minion.pyc
	MusicShowdown/player.pyc
	MusicShowdown/prop.pyc