Checkpoint commit.
Merge branch 'master' of https://github.com/danschumann/group-lunches

Conflicts:
	models/data/lunches.txt
	views/newlunch.jade