HH
Merge remote-tracking branch 'origin/master'

Conflicts:
	Databasprojektet/build/classes/databasprojektet/MainWindow.class
Merge branch 'master' of https://github.com/MrCuddle/Javaprojektet

Conflicts:
	.gitignore
	Databasprojektet/build/classes/databasprojektet/MainWindow.class
Merge branch 'master' of https://github.com/MrCuddle/Javaprojektet

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