Merge pull request #6 from manchesterfish/local_v4

modified index page to support mobile phone
Merge pull request #7 from manchesterfish/local_v4

9.21
Merge pull request #8 from manchesterfish/local_v4

Local v4
delete toufu
Merge pull request #9 from manchesterfish/local_v4

new dish
Merge branch 'master' of https://github.com/changrh/foodrocks.hk

"Photo Added"
Monday Version
Merge branch 'master' into local_v4

Conflicts:
	app/assets/stylesheets/application.css
	public/assets/application-88645f640055d1e29f9c39b74a3a6544.css
	public/assets/application-88645f640055d1e29f9c39b74a3a6544.css.gz
	public/assets/manifest-7e8817de03660cbe30832c444cb77e8f.json