prep master
Merge branch 'master' into ReadMe
readme up to date
Merge pull request #39 from TIYA-Durham-GDI/ReadMe

Read me
fixed about page
merging with master
spell correction
prep for merge
preped for master
Merge pull request #40 from TIYA-Durham-GDI/new_chapter

New chapter
fixed image uploader
Merge pull request #41 from TIYA-Durham-GDI/images

fixed image uploader
opener image positioned correctly
minor changes
Merge pull request #42 from TIYA-Durham-GDI/responsive-2

Responsive 2
Merge branch 'final-design'
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/home/index.html.erb
	app/views/locations/index.html.erb
	app/views/locations/show.html.erb
repaired background image