test commit
Merge branch 'master' of https://github.com/artuurslv/flashCMS
Revert "QCon Project"

This reverts commit 97ba8ebe96f666a5b25dd7a810a02bd73902627b.