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

Conflicts:
	database.cpp
	database.h

	modified:   database.cpp
	modified:   database.h
	modified:   insert.cpp