ui breytingar teknar út f master
sql file kominn :D
repository changes
Merge branch 'evarepository' of https://github.com/Fanneyyy/hairy-ironman into evarepository
new class: computer
Merge pull request #1 from Fanneyyy/thorri-computerClass

new class: computer
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman into evarepo

Conflicts:
	QtPersons.pro
Merge pull request #2 from Fanneyyy/evarepo

Evarepo
Merge branch 'master' into UI-Stebbi

Conflicts:
	printui.cpp
	printui.h