student created
model created
Merge branch 'master' of https://github.com/dalanmiller/Scotty