Merge branch 'master' of https://github.com/ProperFish/MyChamp.git