Added option for saving videos rather than displaying them immediately
Resolved conflicts in main.cpp
Resolved conflicts in main.cpp