updated omdb parser
fixed merge conflicts
fixed merge conflicts
Merge pull request #35 from bobolinks-2014/guidebox-parser

updated omdb parser