Reconfigured database for city/state.
Merge branch 'master' into cole
Merge pull request #41 from areveal/cole

Cole
added auth to actions
Merge branch 'master' into william
Couple minor changes for database reconfiguration.
Merge pull request #42 from areveal/william

William
Merge branch 'master' into cole
Updated edit pages to have side shows
all button function directing accurately on profile page
Merge branch 'master' of https://github.com/areveal/capstone into justin
Minor changes.
Merge branch 'master' into cole
Merge pull request #43 from areveal/cole

Cole
Merge branch 'master' into william

Conflicts:
	app/views/Users/create-edit.blade.php
	app/views/Users/show.blade.php