test hest
Merge branch 'master' of github.com:niive12/CupCollector

Conflicts:
	code/cupcollector/main.cpp
	code/cupcollector/tekmap/tekmap.hpp