Kategorier implementerade

yay
Merge remote-tracking branch 'origin/master'

Conflicts:
	Databasprojektet/build/classes/databasprojektet/MainWindow.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	Databasprojektet/build/classes/databasprojektet/MainWindow.class