Merge pull request #2 from jennywen/jenny

stylez!
renamed controllers and other objects
Merge pull request #3 from jennywen/juliet

renamed controllers and other objects
merge conflict fix