Spikes now moving 2 at a time
Updated ContactListener
Merge remote-tracking branch 'origin/master'