LOTS OF CHANGES MOST OF WHICH WERE PAIR PROGRAMMED AND I TOTALLY DON'T REMEMBER THEM ALL
Merge branch 'master' of https://github.com/Flux159/Polymorph