woho
Merge branch 'master' of ssh://git@github.com/joakimlavenius/Databas_Superguild.git

Conflicts:
	DatabasSuperguild/src/superguild/Main.java