Final result

All files included.
Merge branch 'master' of https://github.com/filiphl/FYS3150

Conflicts:
	project3/main.cpp
	project3/p3plot.py