Merge branch 'master' of https://github.com/mrywapp/myrw

Conflicts:
index.html
js/main.js