form progress
Merge branch 'development' of github.com:erizye/Staticity into development
Merge branch 'development' of github.com:erizye/Staticity into development
form working
Merge branch 'development' of github.com:erizye/Staticity into development

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/cities_controller.rb
	app/views/cities/show.html.erb
	config/routes.rb
conflicts resolved
form working