resolves #20
Merge branch 'master' of github.com:PlasmaTrout/latchd-content-engine