modified:   sqlite.cpp
	modified:   sqlite.h
Merge branch 'skilaverkefni2' of https://github.com/Verklegtnamskeid1/Skilverefni1 into skilaverkefni2

Conflicts:
	sqlite.h