halp
summary conflict fixed
Merge branch 'gh-pages' of ssh://git@github.com/souffle/chtnasp into gh-pages
blah settings