Carrierwave Gem
Merge branch 'development'
Update admin controllers to permit attributes
Merge branch 'activeadmin'
Uploader File
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader
Allow more attributes
Remove redundant id field from bio
Locations Views
Merge pull request #3 from TIYA-Durham-GDI/file_uploader

File uploader
Fix schema conflict
Ignore uploaded images
Add location to admin_user and pic to bio
Commited
scaffolded scss files
Updated
Improve user selection for bio
Home Page Showing location
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader
Image Working On View