edit some things
edit
merge gh-pages