gitignore for merge
merged files from master into gh-pages and deleted unnecessary