Merge branch 'gh-pages'
Merge branch 'gh-pages'

Conflicts:
	about.html
fixed problem
Merge branch 'master' into gh-pages