blabla
Merge branch 'master' of ssh://git@github.com/Nea5/GUI_project.git

Conflicts:
	TimeManager/src/control/Controller.java
Fixed error msg when no todos.srz exists.