adding carrierwave file upload to learning module
fixing conflicts
editing merge
Merge branch 'master' into alli/file_upload
adding file upload/download
breaking lines for style)
merged with master
finishing merge with master
Merge pull request #65 from calblueprint/alli/file_upload

Alli/file upload