Refactor html and reviewed js for JQuery
Merge branch 'gh-pages'