take out password in user model
Merge pull request #11 from pocket-gophers-2014/fix_user_model

take out password in user model
Revert "fix user migration, do not need password, just password_digest"

This reverts commit 2b4fd44632379f6e163d7b7ba20d4383a66780fd.

Conflicts:
	app/models/user.rb
REAL USER  MODEL
Merge pull request #13 from pocket-gophers-2014/user_model_fix

User model fix
adds factories file to create users, creates passing tests for the user controller
users.js refactoring/prep for jasmine testing
jasmine testing working aside from fixtures
settled merge conflict in user model no major changes