Merge branch 'marketing' of github.com:zurb/ink into marketing

author anthonytadina <anthony@zurb.com>

Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)

committer anthonytadina <anthony@zurb.com>

Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)
author anthonytadina <anthony@zurb.com>
Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)
committer anthonytadina <anthony@zurb.com>
Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)
diff --cc docs.php
Simple merge
diff --cc includes/_top-bar.php
Simple merge
author	anthonytadina <anthony@zurb.com>
	Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)
committer	anthonytadina <anthony@zurb.com>
	Mon, 30 Sep 2013 20:19:45 +0000 (13:19 -0700)
		1	2
docs.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/_top-bar.php	patch \|	diff1 \|	diff2 \|	blob \| history