python opts
big merge in js/html

Merge branch 'master' of https://github.com/rzhou186/Echo
big pull
Merge branch 'master' of https://github.com/rzhou186/Echo
Finished html?

Merge branch 'master' of https://github.com/rzhou186/Echo
tweaks
pre final push merge

Merge branch 'master' of https://github.com/rzhou186/Echo