My changes

To use with mergetool... God doing this SUCKS. I will. Never. Forget.
To. Commit. Again.
Merge branch 'master' of https://github.com/CosineGaming/CodeIndigo