Merge gh-pages into master

changed readme file