Add gitignore
updated settings
Merge branch 'master' of https://github.com/nickmaxwell10/ncog