updated
updatMerge branch 'master' of https://github.com/schdomin/nbody_cpu

Conflicts:
	src/main.cpp