Det er helt galt
Merge branch 'master' of https://github.com/NiklasRenner/SUM-Projekt

Conflicts:
	HD-Solutions/nbproject/private/private.properties
	HD-Solutions/nbproject/private/private.xml