Whatever
Finish views and basic controller actions
Merge branch 'views'