skemmtilegar breytingar

alltaf gaman
Merge branch 'master' of https://github.com/steinarmh14/test1

Conflicts:
	userinterface.cpp