Changed time divs to time tags
Merged