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
new image sizes
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader
secrets.yml uptodate
added meta charset utf-8 to head of html files
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into sponsors
Resolved merge conflicts
stashing
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
make shit work
Merge pull request #5 from TIYA-Durham-GDI/sponsors

Sponsors
sonsors are up not location specific