Merge branch 'ektorp' of github.com:msveshnikov/url-shortener into ektorp
WIP