Updated .gitignore
Merge branch 'master' of https://github.com/jpmec/ggp-base into feature/propnet-state-machine