Merge pull request #5 from mike6838/Andrea

added comment times in comment.rb model
css
fixed conflicts
css and dcats
css changes
fixed merged conflict