adding carrierwave file upload to learning module
fixing conflicts
editing merge
callback for creating profiles when users are created
Merge branch 'master' into alli/file_upload
adding file upload/download
Merge branch 'master' of https://github.com/calblueprint/roots-of-success into vincent-teacher-student-profiles
profile filled in on login fix, teachers have access to profile
profiles lead to respective dashboard
please don't find me houndci
Merge pull request #67 from calblueprint/vincent-teacher-student-profiles

Vincent teacher student profiles
create specific profiles for user types
new after_create method for each specific user
Merge pull request #68 from calblueprint/ethan/headers

add headers
changing profiles controller for specific users
add curriculum and manage teacher links to admin head
move around links in manage teachers and admin index
Merge pull request #69 from calblueprint/work-with-ethan

Work with ethan
changed a bunch of profilt stuff
correct profile routing when user logs in