Rolled back to john's and added gitignore
Merge branch 'master' of https://github.com/addahlbe/MinionTriForce