j
Merge branch 'master' of https://github.com/BitBallers/GammaRayKitten

Conflicts:
	sprites/Tile.py
Git is mad at me
Merge branch 'master' of https://github.com/BitBallers/GammaRayKitten

Conflicts:
	sprites/Tile.py
Merge branch 'master' of https://github.com/BitBallers/GammaRayKitten