Merge branch 'master' of github.com:flimshaw/charliehoey.com
imported fitVids for video clips, going to try to get a slideshow working now