more
yea
Merge branch 'master' of https://github.com/ryan1010/proj1

Conflicts:
	index.html
x
fixed merge issue