update secret_key_base
add initial user model rspec
fix merge conflict in schema
Merge pull request #3 from hartsick/user-test

User test