master file
resolve and add badFile

Merge branch 'master' into test

Conflicts:
	test.html