added basic collision detection and movement along currents.
Merge pull request #2 from cjwillia/master

it's 7 am