added missing .gitignore file and, guard
updated guardfile
fixed merge conflict
updated gemfile to accomodate guard
completed user model test, user controller user tests in process
users_controller testing complete
added feature test for user login and signup
updated the sessions controller specs, all tests green
fixed error in migration file, updated schema to match current
Fixed merge conflicts