add sample.html back
Merge branch 'dev'

Conflicts:
	sample.html