Fixed controllers
 Please enter the commit message for your changes. Lines starting
Merge pull request #9 from jennywen/juliet

Fixed controllers