.
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git
TestDBGetMote
.
Merge branch 'master' of ssh://git@github.com/jonasws/Fellesprosjekt.git

Conflicts:
	Fellesprosjekt/.classpath