initial version
initial
initial three
second of file two
too of two
using changes from both repos.

Merge ../gittwo/gittest

Conflicts:
	two.txt
initial
Merge branch 'master' of https://github.com/dscamp/gittest