add gitignore to gitignore :)
Merge branch 'master' of github.com-michaelhawkins:michaelhawkins/gitignore

Made changes to github/master via the github.com UI and then made a local change. Now I have to merge them.