added post model and controller, missed it before
Fixed a mergeconflict