removed duplicate colorbox req
Merge branch 'master' into heroku_flip
Merge pull request #84 from eugenefilimonov/heroku_flip

Heroku flip