set up queries controller spec
create queries spec
create query controller tests
create query model specs
controller and model complete for query rspec
resolve merge conflicts
resolve merge conflicts
Merge pull request #47 from ahardy55/master

Added testing to queries
merge
Merge branch 'master' of https://github.com/red-spotted-newts-2014/translateYo into styling