Working on edit
Need to figure out why not working. >:(
slight mod
Added chicago
fix edit
Account Settings merge

Conflicts:
	app/views/layouts/application.html.erb
	db/schema.rb
deleted messages