lightbox is in
fixed merge
lightbox is out, fancybox is in
going to pull
wtf
fancybox now works with videojs
fixed merge
Merge pull request #11 from dbcfoxes2014/dan

Dan
merging dans
fixed conflict
fancybox integrated with search pictures.  need to make sure it works with videos
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into dan
images are now in a grid
hid dev keys, PHEW
Merge pull request #12 from dbcfoxes2014/dan

Dan
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into ENV_keys