Added setup for settings section for sprint 3
Merge branch 'master' of github.com:Thalmann/swf613-rapport

Conflicts:
	content/sprint2/evaluation.tex
	main.tex