modified:   consoleui.h
	modified:   mainwindow.cpp
	modified:   mainwindow.h
	modified:   scienceservice.h
	modified:   skilaverkefni3.pro.user
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilaverkefni3

Conflicts:
	skilaverkefni3.pro.user