add feature testing to query
pull new upstream
set up languages controller test
preHeroku1 save
editted users page
gemfile
deleted and readded Gemfile.lock for rails12factor
Merge pull request #65 from hilarybarr/master

What I pushed to Heroku v 1
merge with upstream master
re-routing back to query page on up and down vote
fix comments controllerr tests
Merge pull request #66 from ahardy55/master

Fixed redirects, some testing
Comment out test that is pending
Merge pull request #67 from fma2/final-changes

Comment out test that is pending
merge
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into language
add upvote downvote buttons
Add test for bing_create
Merge pull request #68 from stellajkimm/language

Language
Add query new path, comment out bing_new path - because in modal
Comment out test