gitignore and settings
Merge branch 'master' of github.com:tparnell8/NOCQ