work in progress
Merge branch 'master' of https://github.com/AJSchat/Rushhour

Conflicts:
	main.c