Merge conflicts, CSS changes

sc3 / crime-punishment

Crime and Punishment in Chicago

http://crime-punishment.smartchicagoapps.org/

Other

11 stars 12 forks source link

Closed sarahelizabeth closed 10 years ago

sarahelizabeth commented 10 years ago

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