modified:   computer.cpp
	modified:   computer.h
	modified:   main.cpp
	modified:   scientistrepository.h
        modified:   skilaverkefni3.pro
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3