Merge origin/master

Conflicts:
	src/nbodybruteforce/NBodyGraphics.java