update index.html
conflict fixed
conflict fixed 2
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Merge pull request #3 from milkpod29/master

conflict fixed 2