did some controller, require ActiveRecord
filled out controller class
Merge branch 'controller'