not working
index styling
states
updated
for the rufs
Fix weird nesting issue
not great
Sort states alphabetically
homepage styling
location.show
join us
merged
home page styling and added image files
merge conflicts
Remove lat & long from seeds
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/assets/stylesheets/modules.css.scss
	app/views/home/index.html.erb
	db/schema.rb
Merge branch 'master' into Styling

Conflicts:
	app/views/locations/show.html.erb
	db/schema.rb
	db/seeds.rb
Make both bios html safe
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
	db/schema.rb
Merge branch 'Styling'