Merge branch 'master' into coursera
Merge branch 'master' into coursera
Merge branch 'master' into coursera
Merge branch 'master' into coursera
broke ground on video and fig parsing in rmd2df
rmd2df now supports video and figures
a few more tweaks to rmd2df and removed test lesson
Merge pull request #98 from ncarchedi/master

rmd2df now handles video and figures
Replacing code inadvertantly deleted in a Byzantine sequence of branching and merging.
Merge branch 'master' into coursera
updated readme with course authoring info
Skip count is uploaded to Coursera in the form of spaces at the end of base64 encoded word.
Merge branch 'master' into coursera
Merge remote-tracking branch 'swirldev/coursera' into coursera
DESCRIPTION and NAMESPACE fixed to pass devtools::check. They were probably corrupted in earlier, Byzantine sequence of merges and deletions.
removed excess comma in DESCRIPTION
dealt with merge conflict in DESCRIPTION
added function to deal with lesson dependencies
some much needed updates to docs using roxygen 4.0.0
dealt with case where 'lesson' file has no extension