new version
Merge branch 'master' of https://github.com/niive12/CupCollector