styling
admin style updated
profile updated
bio info p tag adjustment
activeadmin logoutpath fixed
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into activeadmin
no aws
no aws1
just kidding still not working
state images
merge conflicts
resolved merge conflicts
Merge branch 'master' into Styling

Conflicts:
	app/views/home/index.html.erb
	db/schema.rb
setting up heroku
setting up heroku1
Attempting to get S3 working
Attempting to get S3 working
WIP, DON'T PUSH
Merge branch 'master' of https://github.com/TIYA-Durham-GDI/GDI-rails-4

Conflicts:
	app/views/locations/show.html.erb
Merge pull request #20 from TIYA-Durham-GDI/pre-leaders

Pre leaders