passing tests
test to rspec
rspec folders
editing poll/answers
can edit test
Merge branch 'feature/locking' into develop