Changes in database
Commit conflicts fixed
Merge branch 'master' of https://github.com/JonathanThunberg/Dat076

Conflicts:
	Mathem/src/main/webapp/img/header.jpg