Addet GUI
GUI
GUI again
Merge branch 'master' of https://github.com/Mattidk/Projekt

Conflicts:
	nbproject/private/private.xml
	src/gruppeprojekt/RessourceType.java
	src/presentation/GUI.java