Commit uusihaara comments
Merge branch 'uusiHaara'

Conflicts:
	src/main.py