About to merge
Merge branch 'master' into more_models
Finished with models
Merge pull request #3 from nealcpeters/more_models

More models
fixed merge conflict in schema