add grouplunches
Merge branch 'master' of https://github.com/danschumann/group-lunches

Conflicts:
	app.js
	routes/lunch.js
Merge branch 'master' of https://github.com/danschumann/group-lunches