conflict res
test conflict again
Merge branch 'master' of https://github.com/sanja7s/SET37s

Conflicts:
	SET3/__main__.py
when copy from server this file get messed with some text so i had to
edit it again. lets try to go back now.