tests working
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into front-end-testing

merging master
Merge remote-tracking branch 'origin' into frontend

mergin frontend
added css for med-small screens
Merge pull request #60 from bobolinks-2014/search_controller_spec

Testing for multiple query types
updated user model spec
added user preference model spec
Merge pull request #62 from bobolinks-2014/model-spec

model specs
updated rspec syntax
refactored features specs
added more css
Merge pull request #63 from bobolinks-2014/controller-spec

updated rspec syntax
fixed typo
Merge pull request #64 from bobolinks-2014/specs

refactored features specs
user profile is done and fully functional
Merge pull request #65 from bobolinks-2014/frontend

user profile is done and fully functional
updating with master
finished small screen css
test coverage for js files
merged with master