Timeline edits (4/12/14)

I am trying to upload my changes again. since they were deleted during a merge by another person