123
Merge branch 'master' of https://github.com/Miista/scrum.git

Conflicts:
	XP Projekt/src/dk/cph/elective/control/AppController.java