Styling of language pages
Set up comments
Comment out tests and methods for new query - since modals are doing this
Delete new method and new spec for queries since modal is doing this
Merge pull request #54 from fma2/final-changes

Travis-CI
Modify for travis-CI
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into final-changes
Merge pull request #55 from fma2/final-changes

Travis CI
Minor change to travis.yml file
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into final-changes
Merge pull request #56 from fma2/final-changes

Final changes
Merge pull request #53 from hilarybarr/votes2

Set up comments
Fix another travis problem!
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into final-changes
ANother change to travis yml file
Merge pull request #59 from fma2/final-changes

ANOTHER TRAVIS FIX I HOPE THE LAST
fix merge conflicts