Mathias - rubrik
Merge branch 'Database' of https://github.com/Drakenhielm/Biobokningssystem into Database

Conflicts:
	test.txt