add models, controllers and html pages
fixed merge conflict