Implemented rifting - patches in crust are now filled by new ocean crust.
Implmented docking - the smaller of two colliding continents will join the plate of the larger continent.
Merge commit 'c01e129a4a8167d6a31224fff4d186838976d415'
Merge branch 'master' into gh-pages