committing logo and font
gemfile merge error
fixing merge conflicts
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend

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

merging from master
adding bootstrap, and edited app files
Merge pull request #13 from bobolinks-2014/frontend

committing front end status