fixed merge conflicts
fixed these conflicts
returned the result
Merge pull request #74 from bobolinks-2014/front-end-testing

Front end fixes