sammordnet
sammordnet
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/RegistrerSokerPANEL.java
	src/eneboligliste.data
	src/kontraktliste.data
	src/leilighetliste.data
	src/sokerliste.data
	src/utleierliste.data
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/RegistrerBoligPANEL.java
Jsliders lagt inn