AWESOME non-working changes
Merge branch 'master' of https://github.com/Torkoal/Basic-Game

Conflicts:
	Main.py