Merge branch 'master' into Aaron
Functions importing files from list

Functions can now use files from directory list.
Video player working

Added video player functionality to video function.
Comments made

Commented lines of code.
Hopefully working

Recommented a few lines