modified:   Skilaverkefni3.pro.user
	new file:   baserepository.cpp
	new file:   baserepository.h
	new file:   computer.cpp
	new file:   computer.h
	new file:   computerrepository.cpp
	new file:   computerrepository.h
	modified:   consoleui.cpp
	modified:   consoleui.h
	modified:   main.cpp
	modified:   main.h
	new file:   mainwindow.cpp
	new file:   mainwindow.h
	new file:   menus.h
	new file:   scienceservice.cpp
	new file:   scienceservice.h
	new file:   scientist.cpp
	new file:   scientist.h
	new file:   scientistcomputerconnections.cpp
	new file:   scientistcomputerconnections.h
	new file:   scientistcomputerconnectionsrepository.cpp
	new file:   scientistcomputerconnectionsrepository.h
	new file:   scientistrepository.cpp
	new file:   scientistrepository.h
	deleted:    sk2data.cpp
	deleted:    sk2data.h
	modified:   skilaverkefni3.pro
	deleted:    sqlite.cpp
	deleted:    sqlite.h
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3

Conflicts:
	Skilaverkefni3.pro.user