Added title
Merged gh-pages into Master and fixed merge conflict
added text for test file list item
Merge branch 'gh-pages'
merged gh-pages with master, then test with master and resolved conflicts