vi/for_merge

A test repository to demonstrate git merging and rebasing