view
Merge branch 'master' of https://github.com/andy0304/What2Eat

Conflicts:
	what2eat/coverage/.last_run.json
	what2eat/coverage/.resultset.json
	what2eat/coverage/index.html