vigilant/marketing-site — pull request #8 by thisispayal (2013-07-18 15:50:49+00:00)
Title: Integrated Dan's updates into mine

There was a conflict in gridpak.css, but I resolved our fomatting.