updated from github master
updated
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
deploying to heroku again
updated with ninas branch
Merge branch 'master' into styling
Merge branch 'master' of https://github.com/fiery-skippers-2014/its-nacho-problem
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
fixed the signup form issue
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
Merge pull request #32 from fiery-skippers-2014/styling

Styling
deleted sessions/new.html.erb because we don't need it
deleted sessions/index.html.erb because we dont neeed it
signup passwords must match alert done, but it shows up twice