Final touch before deadline (major touch)
Merge branch 'master' of https://github.com/TeamPhlox/Cognitio