snapshot
Merge branch 'master' of github.com:rsdoiel/ypg2yui3

Conflicts:
	htdocs/index.html
snapshot