my first commit here
whatever
Master fix 1
Master fix 2
commit in branch
Change 1
Change 2
This was the kitty message
whatever
whatever
whatever
Revert "whatever"

This reverts commit 7fc218d80cb8665d94f717730b03ed447b955345.

Conflicts:
	martinv-feature1.txt
Merge branch 'martinv-feature1' of https://github.com/mbvlist/hellogitworld into martinv-feature1

Conflicts:
	martinv-branch.txt