Make a basic User model (including secure passwords)
Added more tests to email
Finish user signup
Fix user.rb merge error