collision rev03 (final) -- MERGE TIME

added boundary collisions and a bunch of comments.