asd
sadfMerge branch 'master' of github.com:zizou89skovde/Projekt-TSBK07

Conflicts:
	projekt/object.c
stenj�vel visas