Merge pull request #1 from winterflame/winterflame_branch

Update test.txt
Merge pull request #2 from winterflame/winterflame_branch

Update test.txt
testing
Merge branch 'master' of https://github.com/winterflame/learnGitHub into winterflame_branch

Conflicts:
	test.txt
ok
hey
Update test.txt
hey
Update test.txt
d
hi
hi