tillfällig commtiment
Merge branch 'GUI' of https://github.com/parland/morganizer into GUI

Conflicts:
	package.bluej