Implements fast forward merges (although with dummy messages, so far).

Closes #1.
test