Corrected Geometry Test

Changed unsuitable characters in variable names to "s"
Addition of collision and equilibrium calculations
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/LatBo.jl
	test/runtests.jl