adding merged files
added parapraph for gh-pages
merge