Added posts to the front page
fixing conflicts