controller clean up
Merge branch 'master' of github.com:ErikPeterson/milkman
create test
merge fix