rails g
Merge branch 'master' of github.com:dylanjha/recipes-backbone

Conflicts:
	.gitignore