No, tak to sem zvedavej
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Wavelength.cpp