Merge branch 'gh-pages'
fixed div
pic1
Merge branch 'master' into gh-pages