actually deleted redundant folder...
Merge remote-tracking branch 'origin/master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'
small code cleanup