partially completeted login signup
pulling master Merge branch 'master' into login_signup_sessions
login and signup forms rendering with ajax
pulled from masterMerge branch 'master' into login_signup_sessions
modified login signup form details
fix merge conflicts
login signup functional but without styling or tests
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
Merge pull request #15 from pocket-gophers-2014/login_signup_sessions

Login signup sessions
Merge conflict user model solved