1. controller , model
Merge pull request #2 from hydra200238/master

controller , model