fixed merge conflicts and removed the specs
Merge branch 'front-end-testing' of https://github.com/bobolinks-2014/browsin into front-end-testing

merging errors