Clock updates on article read
Fixed merge problems
Merge branch 'master' of https://github.com/rhaining/racism_countdown