updated .gitignore
Merge branch 'master' of https://github.com/carsondarling/CarsonDarling.github.com