initial commit
resolve
resolve conflict
Merge branch 'master' of https://github.com/h2rd/shortener into fix

Conflicts:
	README.md