I'm still lost
Merge branch 'master' of github.com:PillarCMS/PillarCore