Fix user model for full_name and change tests
Fix merge conflict, users.rb and schema.rb
Merge pull request #46 from ianderse/model-user

Model user