grunt deploy
Merge branch 'master' of github.com:officefood/webapp

Conflicts:
	index.html