tables
merge conflict fix
merge conflict fix
fixed CreateIngredientsRecipes join table associations
fixing migration file 2
"remergin after conflict fix"
Merge branch 'shakrah_and_shane'