dfdgdfg
Merge branch 'master' of https://github.com/rstibora/PV168-project

Conflicts:
	Tasks/src/main/java/cz/muni/fi/pb168/MainWindow.java