original git dir
second message added
third message added
fourth message added
make some change that will be undone
Revert "make some changes that will be undone"

This reverts commit dbbc950f2c33b091aa5b48e2bf4e501cfed802d9.
make changes to h.txt
edit g.txt
add crazy stuff
first msg
second msg
third msg
make changes in master
Merge branch 'gamo'

Conflicts:
	g.txt
tenth change
start feature
fix security hole
fix conflict again
fix security hole
add 13rd msg