feature z
commit B
feature z 2
Merge pull request #3 from murrown/feature-z

Feature z