Merge pull request #24 from phantomkirby/master

lol
added fat exercising droid to video view
Merge remote-tracking branch 'upstream/master'