pitt-delta-chi/pittdeltachi.com-RoR — pull request #14 by D-Land (2014-04-09 14:47:52+00:00)
Title: Merged tree

This has all the merge conflicts resolve. Take a look at it. #7 #5