modified:   database.cpp
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3

Conflicts:
	database.cpp

	modified:   database.cpp
	modified:   database.h
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3