Reading time working. Updated views and Entry model
Fixed merge conflicts
Updated gemfile