sync

Conflicts:
www/index.html
fix