more chanegs
Merge branch 'master' of github.com:emofeedback/urlshortener
more fixes