Marc's verandering 1
Merge remote-tracking branch 'origin/master'

Conflicts:
	rushhour/rushhour.py
Merge branch 'master' of https://github.com/Jesse-B/rushed

Conflicts:
	rushhour/rushhour.py
veranderingen opgelost