created post model
created views
fixed merge conflicts
updated posts controller