created the controller and model and views
 fixing merging confilects