took out emotion rating feature
add date
took out about link
resolve merge conflicts
Merge pull request #92 from christophwong/pretty

Pretty