Delete test
changed image location
Merge branch 'testBranch'

Conflicts:
	boot4.html