Merge branch 'master' of https://github.com/rickyyu2294/Bearpocalypse

Conflicts:
	gfxMgr.py
	media/splash/poop.gif
	media/splash/poop7.gif
	poop.gif
Merge branch 'master' of https://github.com/rickyyu2294/Bearpocalypse

Conflicts:
	gfxMgr.py