boop

boooopy
Merge branch 'master' of https://github.com/solf1re2/1D_Game

Conflicts:
	game/main.py