w1-commit8
Merge branch 'master' of https://github.com/skantha/Group-Dine

Conflicts:
	Procfile.txt