commit
Merge branch 'master' of github.com:Sailorflares/KnowledgeBase into results_page