Commited
scaffolded scss files
Updated
Home Page Showing location
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader
Image Working On View
Add livereload
Linked stylesheets to manifest and started coding index.hmtl.erb
Updated controllers and established application templates
Bio associated to Location
fixed merge
Merge pull request #4 from TIYA-Durham-GDI/file_uploader

File uploader
WIP: adding roles
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
Implement admin roles
Merge branch cancan
Add quiet_assets