styling
Merge branch 'master' into Styling

Conflicts:
	app/views/home/index.html.erb
	db/schema.rb
started about page
Merge branch 'master' into Styling

Conflicts:
	app/views/home/index.html.erb
Merge branch 'Styling' of github.com:TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
	config/initializers/carrierwave.rb
fixed error messages
Merge branch 'Styling' of github.com:TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
	db/seeds.rb
p taging info for profile bio
styled about page along, design tweaks across site, worked on smacss
fixed chapter index
Merge branch 'Styling' of github.com:TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/home/index.html.erb
	app/views/locations/show.html.erb
Merge branch 'master' into Styling
Merge branch 'Styling'

Conflicts:
	app/views/locations/show.html.erb