Did some work on exercise B and added some lines in the preamble in main.tex
Added ignore on *.swp
Merge branch 'development' of github.com:PaulMag/FYS3150_project2 into development

Conflicts:
	tex/main.tex
Fixed conflict by comparing by eye.