Committing someone's work
Merge branch 'master' of github.com:samatjain/milkshake

Conflicts:
	views/add.jade