Fix diverging conflicts, not sure how this happened but it did
[3501/stronghold-2016] / .gitignore
2015-12-31 Kevin ZhangAdd gitignore