Updated script and html
pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	main1.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	main1.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	main1.pyc