fixed spelling mistakes
merge conflicts resolved
Merge branch 'master' of github.com:JasonBenn/raiseyourhand into create-lesson
Merge branch 'master' of github.com:JasonBenn/raiseyourhand into create-lesson
remove unused files
Content creation api end point
validates the presence of associated object
multi player working
multi player multi splits working
no progresss, but no drawbacks, booyah?
object being read from db on the front end
progress bar clips render with correct placements
dynamically add videos on edit page
create content specs
dynamic progress bar splitting working
bug fixes
update action and passing specs
merge conflict resolution
Merge pull request #23 from JasonBenn/edit_lesson

Edit lesson
resolve merge conflicts