Merge branch 'commonclient' into dev
add parameter to simulation to toggle collision detection
Merge branch 'dev' of shurelia:repo/gravsim into dev
draw orbits in bin/graphic

bin/simulation stores all positions and bin/graphic uses them to draw
the orbit, slow and ugly as fuck, gotta come up with something better
speed up orbits a bit
Merge branch 'plot_orbit' into dev
Merge branch 'nocollision' into dev

Conflicts:
	gravsim/simulation.py
add ability to focus a Thing
Merge branch 'speedup' into dev
Merge branch 'dev'