Remove a trailing slash
Merge branch 'master' of github.com:vtemian/zipa
Moved dict_merge into utils.py
#ep14boat: Return attr from model instead of method
We have a right call now
#ep14boat: Moved Resource class to resource
#ep14boat: More magic please
Merge branch 'master' of github.com:vtemian/zipa