test
ny test
Merge branch 'database' of ssh://git@github.com/jonasws/Fellesprosjekt.git into database
annen test
.
.
Merge branch 'database' of
ssh://git@github.com/jonasws/Fellesprosjekt.git into database

Conflicts:
	Fellesprosjekt/src/database/DBKomMote.java
mer tester
Merge branch 'database' of ssh://git@github.com/jonasws/Fellesprosjekt.git into database
bugfix
Merge branch 'database' of ssh://git@github.com/jonasws/Fellesprosjekt.git into database
test endreRomKap
Merge branch 'database' of
ssh://git@github.com/jonasws/Fellesprosjekt.git into database

Conflicts:
	Fellesprosjekt/src/database/DBKomMote.java