Merge branch 'gh-pages'
fixed title
changed stuff