hej
Vad händer nu?!
Push to master
Merge branch 'master' of https://github.com/Nea5/GUI_project.git

Conflicts:
	TimeManager/src/gui/ListsPanel.java