added gitignore file
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem

Conflicts:
	.gitignore
Merge branch 'seed_ingredients' of https://github.com/fiery-skippers-2014/its-nacho-problem
merged Ninas changes. All green on my screen
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
playing with before_filter
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'seed_ingredients' of https://github.com/fiery-skippers-2014/its-nacho-problem
Merge branch 'seed_ingredients' of https://github.com/fiery-skippers-2014/its-nacho-problem into seed_ingredients
Merge branch 'master' into seed_ingredients
merged Erins and Ninas changes
Merge branch 'master' into spike
spike branch do not merge
fixed merge conflict do not merge spike
added user_ingredients join table
Merge pull request #18 from fiery-skippers-2014/recipe_search

Recipe search