modified:   consoleui.cpp
	modified:   consoleui.h
	modified:   sk2data.cpp
	modified:   sk2data.h
	modified:   sqlite.cpp
Merge branch 'skilaverkefni2' of https://github.com/Verklegtnamskeid1/Skilaverkefni-numer2 into skilaverkefni2