User
Fixed it (not my fault)
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Merge pull request #123 from glenwayguy/master

Added error handling for oauth errors and such. And the doctor in doctor who should not be abbreviated. And it needs a space.
Merge branch 'better-models' of github.com:CodePilotCo/CMS
Fixed merge conflicts and such