added gitignore *.*~
Merge branch 'gh-pages'