Update README.md
Update README.md
moved controller
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	src/ts/app.ts
	src/ts/factory.ts
	src/ts/gourmap-controller.ts
	src/ts/service/api.ts
Merge branch 'gh-pages' of github.com:funnythingz/Gourmap into gh-pages