sc3/chicago-justice — pull request #109 by sarahelizabeth (2014-03-17 16:18:12+00:00)
Title: Merge conflicts, CSS changes

I don't remember what all in this is new because I have been resolving merge conflicts for what feels like forever now.