added .gitignore
Merge remote-tracking branch 'origin/master' into gh-pages
update gh-pages to be caught up with master branch