added test-1
Merge branch 'master' of https://github.com/kissofdeath/git-test

Conflicts:
	hello.txt