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 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 branch 'master' into error_pages
login error for incorrect password is done
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
Added CSS styling for flash error, notice and alerts
Commented our the User Profile button because right now it doesn't go anywhere.
Changed text on the Update User button to say Add to pantry
updated feature test because I changed the wording on a button