doc
Merge branch 'develop' of https://github.com/jonasberglund/skrubb_DAT255 into develop

Conflicts:
	H-sektionen/src/se/chalmers/h_sektionen/utils/LoadData.java