Added files
resolved conflict
Posts model