update schema.rb so that app works when rails s-ing
Merge branch 'james-branch'
After upedate schema
Merge branch 'master' of github.com:HowHai/Git-Exercise-Repo