test1
Merge branch 'master' of https://github.com/rexhansen/test

Conflicts:
	doc1.txt