ignore
Merge branch 'facebook' of https://github.com/jonasberglund/skrubb_DAT255 into facebook

Conflicts:
	H-sektionen/gen/se/chalmers/h_sektionen/R.java