UPDATE #1

Things added
-Collision detection
-Keyboard input fixed
-Entity System
-Made map say smashing
Merge remote-tracking branch 'origin/master'

Conflicts:
	gui.py