Merge branch 'master' of github.com:zhirafovod/vagrantboxes-heroku

Conflicts:
  www/index.html