name conflicts for html file
Merge branch 'master' of https://github.com/daphnesiyuan/Art-Bin

Conflicts:
	index.html