Merge branch 'gh-pages'
Update File Structure to support GIthub hosting
Merge branch 'master' into gh-pages