README.md
Merge branch 'master' of github.com:niive12/CupCollector

Conflicts:
	README.md