Merge pull request #5 from fiery-skippers-2014/recipes

Recipes
We have sessions and users!
* 3 tests pass (2 controller tests and 1 feature test)
* As a user, I can create an account with a secure password using BCrypt
* As a user, I can login to my account
merged with local master and fixed merge conflicts
User signup works!
working on api parsing
Merge pull request #6 from fiery-skippers-2014/user_login_stuff

User login stuff
Merge branch 'master' into api_testing
git ignore should now be working
Fixed user login form issues
Created a simple ingredients page for the logged in user to land on.
* did NOT create an ingredients table or model or anything
* A user can sign up and view an empty pantry page with a logout button.
* A user can logout.
* A user can log back in.
* The user's info is saved to the database.
* YAY!
* I removed one feature test that keeps breaking due to moving around forms. The unit tests still work!
Merge branch 'master' into user_login_stuff
merged with local master, no conflicts
i
Able to get the recipe name from the json object
Merge pull request #7 from fiery-skippers-2014/user_login_stuff

User login stuff
for merge
fixed merge conflict
fixed merge conflict
switching branches
fixed merge conflict