Merge branch 'master' of github.com:lucasgren/MastersThesis

Conflicts:
	.DS_Store