Merge branch 'master' of https://github.com/romanzubenko/YHack

Conflicts:
app/app.js
resolved