.gitignore
Merge branch 'master' of git@github.com:rkupriyanetc/recipe-manager.git

Conflicts:
	.gitignore
Objects domain diagram