added databasemaintest
added databasemaintest
Merge remote-tracking branch 'origin/Stian' into StianHH

Conflicts:
	Fellesprosjekt/src/main/Main.java