aftur git
Display Computers virkar
Merge branch 'master' of https://github.com/karigeir/Skil3

Conflicts:
	SkilThrju/SkilThrju.pro