made a change in 1
add a html file[issue 53]
fixed the bug
fix iss53
Merge branch 'iss53'

Conflicts:
	1
	index.html