GUi s3
GUI 3
1
gkj
Merge branch 'master' of https://github.com/Miista/scrum.git into
Story3GUI

Conflicts:
	XP Projekt/src/dk/cph/sip/eess/control/AppController.java
Merge branch 'master' of https://github.com/Miista/scrum.git into
Story2GUI
Merge remote-tracking branch 'origin/Story3GUI'
wee