...
Merge branch 'master' of https://github.com/eivsch/Bolig2014

Conflicts:
	Boligformidleren/utleiermengde.data