Making space to pull
Merge branch 'master' of https://github.com/Hsad/Pycade
Knights can jump!  Now what did the design document say about that? .. ah crap
Merge branch 'master' of https://github.com/Hsad/Pycade

Conflicts:
	src/Game.py
	src/Knight.py