Merge pull request #16 from seanot/controller_testing

deleted cornify and flowers, updated user controller
completed user controller testing