First commit
Changing from url_resolver to url-resolver
Fixing conflicts in .gitignore