Merge branch 'master' of https://github.com/rnkn/mcqueen

Conflicts:
	README.md