.
Merge branch 'master' into finish_model_spec

Need updated seed file
user model spec close to done. moving on to other specs
Merge pull request #49 from jpark3000/finish_model_spec

Mostly Finish User Model Spec