pulling
Merge branch 'master' of github.com:devnill/foodbook

Conflicts:
	views/index.ejs