added routes and delete function
deleted candycontroller
merge conflict
more merge conflicts