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