AmpersandJS/ampersandjs.com — pull request #108 by wraithgar (2014-10-30 19:20:52+00:00)
Title: fix merge conflicts w/ PR 104

See #104