merge conflict
Merge branch 'gh-pages'
Merge conflict
deleting files
Making it possible to view tests on gh-pages