added video
git ignore updated
pushing video
pushing video
conflicts resolved in gemlock file