Trying to get right parameters to match paper
Merge branch 'master' of github.com:tommo97/Combined

Conflicts:
	src/body.cpp