scaffolded scss files
Linked stylesheets to manifest and started coding index.hmtl.erb
Updated controllers and established application templates
Resolved merge conflicts
Added doctype and head data to html files
added meta charset utf-8 to head of html files
Resolved merge conflicts
Seed db with RDU info
first draft of single chapter view
importing seed data
resolved merge conflict in application controller
added partials for header and footer, pared down the layout, and refined the templates for the main section and aside
Fixing partial render
added partials for header and footer, pared down the layout, and refined the templates for the main section and aside
Merge ... things
Fix end tags
Merge branch 'onechapter'

Conflicts:
	app/controllers/application_controller.rb
	app/views/locations/show.html.erb
	db/seeds.rb