test git commit
Adding .gitignore
merged
Merge branch 'master' of https://github.com/robottaway/warmachine