datafrom 2d updated (first line removed)
Merge branch 'master' of https://github.com/niive12/CupCollector