removed .gitignore
added a gitignore
fixed URL
Merge branch 'master' into gh-pages