added post model and posts controller
fixed merge conflicts