added lesson demonstrating video and figure use
resolved merge conflict in .gitignore