simplified schema added models
fixed merge error
Merge branch 'master' of https://github.com/NathanAtkinson/mustache-adventure