Moved includes directory out of public directory
Merge branch 'dev'
Merge branch 'master' of https://github.com/gunnar94/aleccarpenter.me