Merge branch 'master' of https://github.com/opentable/front-end

Conflicts:
	test/readme.md