Adding gitignore
Merge branch 'master' of https://github.com/alexanderbanks/Conch-Redone