as
a
Merge branch 'master' of https://github.com/magnusmoan/Fellesprosjekt
a
a
Merge branch 'master' of https://github.com/magnusmoan/Fellesprosjekt

Conflicts:
	DBConnect/klasser/Ansatt.java