Merge pull request #1 from csc309-proj/develop

Develop
Merge pull request #2 from csc309-proj/hanchen2

Hanchen2
Added cropped image ratios;
Merge branch 'steven2'
Connected the video upload button to the views;