first city
unavailable option
package
action help
add readme
Merge branch 'master' of github.com:geta6/express-city

Conflicts:
	.gitignore
	README.md
	config/routes.coffee
	package.json