Student + ES
dfh
Merge branch 'master' of https://github.com/Miista/scrum.git

Conflicts:
	XP Projekt/src/dk/cph/eess/test/StudentsRoundOneSubmitTest.java