back button in query page works
added search in languages
merge
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into language
make up and down votes work
Merge pull request #59 from fma2/final-changes

ANOTHER TRAVIS FIX I HOPE THE LAST
fix merge conflicts
Merge pull request #60 from juljun14/master

up and down votes work
added spec for search
merge
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into language
unicorn-rails gem
Merge pull request #62 from juljun14/master

unicorn-rails gem
add button class to back button in queries show
Merge pull request #61 from stellajkimm/language

Language
delete features we don't need
Merge pull request #63 from juljun14/master

delete features we don't need
Remove spec from simple cov
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into final-changes