Lol
Merge branch 'master' of https://github.com/Madelelo/Fellesprosjekt

Conflicts:
	bin/gui/MainFrame.class
	bin/model/DatabaseConnection.class