changes by dev2
blah
Merge branch 'master' of https://github.com/bartvanhoey/TestRepoGitHub
qsflqsf
Merge branch 'master' of https://github.com/bartvanhoey/TestRepoGitHub into NewBranch

Conflicts:
	asdf.txt