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

Conflicts:
	database.cpp
	database.h
	mainwindow.cpp
	mainwindow.h
	skilaverkefni3.pro.user

	modified:   computerrepository.cpp
	modified:   consoleui.h
	modified:   database.cpp
	modified:   database.h
	modified:   main.cpp
	new file:   mainwindow.cpp
	new file:   mainwindow.h
	modified:   science_db.sqlite
	modified:   scienceservice.h
	modified:   skilaverkefni3.pro.user