modified:   baserepository.cpp

	modified:   database.cpp
	modified:   database.h
	new file:   skilaverkefni3.pro.user
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3

Conflicts:
	skilaverkefni3.pro.user

	modified:   database.cpp
	new file:   database.ui.autosave
	modified:   insert.ui
	new file:   insert.ui.autosave
	modified:   mainwindow.cpp
	new file:   mainwindow.cpp.autosave
	modified:   mainwindow.h
	new file:   science_db.sqlite
	deleted:    skilaverkefni3.pro.user
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3

Conflicts:
	database.cpp
	database.h

	modified:   database.cpp
	modified:   database.h