Add all files
Merge branch 'master' of https://github.com/naf456/Project-COMBAT
attempt .gitignore fix