...
...
Merge branch 'master' of https://github.com/Sebelino/Team18

Conflicts:
	Projekt/src/gui.py
Merge branch 'master' of https://github.com/Sebelino/Team18
lol
Merge branch 'master' of https://github.com/Sebelino/Team18
lol
Merge branch 'master' of https://github.com/Sebelino/Team18
lol
lol