Edit file on newbranch
more changes on new branch
qsflqsf
Merge branch 'master' of https://github.com/bartvanhoey/TestRepoGitHub into NewBranch

Conflicts:
	asdf.txt