Merge branch 'master' of https://github.com/ralawar/AMazingRace.git

Conflicts:
	README.md
Merge branch 'master' of https://github.com/ralawar/AMazingRace