creating controllers and views
create raw understand version
merge conflics with master