fluffy
stupid git
Merge branch 'master' of https://github.com/osmpgrupp2/osmpgrupp2

Conflicts:
	ProblemSet3/mini_projekt/src/add.erl
tog bort kommentarer
fix mergeconflict