added ability to make a capital city
added factory for Country with Capital
added city_id to User