updated gitignore
Merge branch 'master' of https://github.com/Astrochimp/ColgateTheScene

Merging changes and updating gitignore.