Merge pull request #4 from TIYA-Durham-GDI/file_uploader

File uploader
Merge branch 'master' of github.com:TIYA-Durham-GDI/GDI-rails-4 into file_uploader