Updated .gitignore, moved adding entries to its own page.
Merge remote-tracking branch 'origin/master'