merged upstream
merge upstream
delete public assets folder
merging upstream
seeds
6 courses - 2 per user
fixed category id for music course
Merge pull request #55 from jeromeall/master

Courses + Sections seed data
fixed merge conflicts;