pull master
trying to pull master

Merge branch 'master' of https://github.com/cprater/dev_boot_face into user_sign_in
work in progess, testing signup redirect
UNDER CONSTRUCTION
switching to user branch
Merge branch 'master' of https://github.com/cprater/dev_boot_face into create_post
added tests for user login/sign up
fixing merge conflicts in schema
Update index.html.erb
Update home_controller.rb
Merge pull request #9 from cprater/user_sign_in

User sign in