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

Conflicts:
	database.ui
	insert.cpp

	modified:   database.cpp