added controllers and views
added controllers and views
Merge branch 'file collision fixed'