Fixed URL issue
Merge branch 'master' of https://github.com/tafi/ohtzi

Conflicts:
	eshrine/urls.py