oppdatering
Merge branch 'master' of https://github.com/Timian/IS-304

Conflicts:
	nff/nbproject/private/private.xml