Holy Fucking shit updated code
Merge branch 'master' of https://github.com/taurheim/epic-game-challenge

Conflicts:
	joe-niko-2013/gfx.pyc
	joe-niko-2013/main.py
	joe-niko-2013/player.py
	joe-niko-2013/player.pyc
	joe-niko-2013/projectile.pyc