committing logo and font
gemfile merge error
fixing merge conflicts
Merge pull request #11 from bobolinks-2014/ajax-frontend-calls

Ajax frontend calls
OMDB parser created
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend

merging master
Merge pull request #12 from bobolinks-2014/omdb_parser

OMDB parser created
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend

merging from master
adding bootstrap, and edited app files
committing initial bootstrap views
search route is returning proper json objects
added views in BootStrap for if signed in and if not signed in
added some views in css with bootstrap
added home and search controller
added the search and new routes for updated controller
responsive site through md
added application js search watch
search controller
Merge branch 'controller' into frontend

adding search functionality into frontend
gemfile lock file problems