Add city to account creation
Merge branch 'master' of https://github.com/ddgriffin/GG-mvp

Conflicts:
	db/schema.rb