Added specs for country
Added city specs
[development model-city-design] Resolved merge conflict
Merge branch 'development' into model-design-city

Conflicts:
	app/models/country.rb
	spec/factories/countries.rb
	spec/models/country_spec.rb
Merge pull request #5 from Qwinix/model-design-city

[development model-design-city] Resolved merge conflict