sethlilly/Vapor — pull request #27 by andschwa (2014-04-20 04:52:56+00:00)
Title: Removing leftover merge conflict

So there was a merge conflict still in the code of this release, in the footer of the site. Kinda funky looking. This removes it.