Untracked .suo file. Please don't readd it
Merge branch 'master' of github.com:WebGruppe1/HINAdventures

Conflicts:
	HINAdventures.v12.suo