mainin säätöä
Merge branch 'master' of https://github.com/cobrelli/Tiralabra

Conflicts:
	Ohjelma/build/classes/Main/Main.class
	Ohjelma/src/Main/Main.java