vigilant/marketing-site — pull request #23 by thisispayal (2013-07-26 15:10:15+00:00)
Title: Commits hopefully resolved the merge issues.

missing index.html "uses" section, potentially some styles.css problems.