test2
test2
ERLEND
ERLEND
ERLEND
Merge origin/master

Conflicts:
	src/prosjektoppgave/Bolig.java
HEI ERLEND!
Merge origin/master