updated from github master
updated
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
deploying to heroku again
able to view percentage of ingredients you have
sorted now by percentages, not by number of missing ingredient
updated with ninas branch
Merge branch 'master' into styling
Merge pull request #29 from fiery-skippers-2014/styling

Styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
added user model tests
merged
Merge pull request #30 from fiery-skippers-2014/searching_recipes

Searching recipes
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
flash alert works for invalid user passwords
Merge branch 'styling' of https://github.com/fiery-skippers-2014/its-nacho-problem into styling
Merge branch 'master' into styling
Merge pull request #31 from fiery-skippers-2014/master

fixed login form issue
Merge branch 'master' into error_pages
login error for incorrect password is done