proposals for groups
Merge branch 'master' of https://github.com/cgr-sybit/lunchy

Conflicts:
	lunchy/server/server.js