Merge branch 'master' of github.com:msveshnikov/url-shortener
Almost all working