modifiy the models
Figuring out how to do git diff
Merge branch 'master' of github.com:MilesHD/rallyomelet into models

Conflicts:
	views/index.jade