CarletonComputerScienceSociety/ccss-website — pull request #2 by bheesham (2013-09-16 18:06:06+00:00)
Title: Removed conflicts from @cdelahousse's pull request. Can now be merged in automatically.

@cdlahousse's merge request had conflicts. I removed them, and now can merge them in automatically.