We just made our first commit and only included 1 file.
Merge branch 'master' of https://github.com/taylorallred/learnGit into test
added changes to test.hmtl so we can get a conflict
resolve and add badFile

Merge branch 'master' into test

Conflicts:
	test.html