scrum igen
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	Documents/Rapport/SCRUM/scrum.tex
Merge branch 'develop' of github.com:blaavogn/bdsa into develop