upd
Merge branch 'master' of https://github.com/adolgoff/rocky-app

* 'master' of https://github.com/adolgoff/rocky-app:
  js upds
  JS + html
  JS + html
upd
upd
upd