adding more controller stuff
Merge pull request #36 from thewillhuang/simon4

adding more controller stuff