Merge branch 'gh-pages' of https://github.com/OpenClassKnowledgeBase/UIMockup into gh-pages
Merge branch 'gh-pages' of https://github.com/OpenClassKnowledgeBase/UIMockup into gh-pages