Added date and time to posts
cleaned merging conflicts