memorial post edits
test test test
yes
editing tests
controller specs plus hopefully fixed merge conflict
all tests in controller green
Merge pull request #53 from JYoung217/watr

Watr