profile updated
bio info p tag adjustment
no aws
no aws1
just kidding still not working
state images
setting up heroku
setting up heroku1
Attempting to get S3 working
Attempting to get S3 working
Merge branch 'Styling' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
aws and image uploader working
Merge branch 'master' into Styling

Conflicts:
	app/views/locations/show.html.erb
	config/initializers/carrierwave.rb
new sized imaged and maps
Make state appear on chapter page
Merge branch 'Styling' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	app/views/locations/show.html.erb
	config/initializers/carrierwave.rb
image resizing
merge conflict
Merge pull request #22 from TIYA-Durham-GDI/Styling

Styling
Merge branch 'master' into mapPhase2

Conflicts:
	app/assets/javascripts/chapter_map.js