add feature testing to query
pull new upstream
set up languages controller test
preHeroku1 save
Merge pull request #64 from fma2/final-changes

Final changes
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