added time to chocolate.html
merged chocolate.txt