First commit, finish basically
Merge branch 'master' of https://github.com/guesn10000/JTTMagicLine