Var að vinna i sort :)
Merge branch 'master' of https://github.com/Fanneyyy/hairy-ironman

Conflicts:
	main.cpp
	service.h