asd
asd
asd
komitting
Merge branch 'master' of https://github.com/LegenderuInc/OOProg

Conflicts:
	Legendaru2Inc/Globalefunksjoner.cpp
	Legendaru2Inc/Globalefunksjoner.h