add views and posts controller
fix merge conflicts