initial test file

test --amend command
Merge branch 'master' of github.com:protoss1010/test

Conflicts:
	test.txt