<p>This works. Am resolving the merge conflicts before pushing to master.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href='https://github.com/opentechinstitute/commotion-docs/pull/94#issuecomment-37224536'>view it on GitHub</a>.<img src='https://github.com/notifications/beacon/3074564__eyJzY29wZSI6Ik5ld3NpZXM6QmVhY29uIiwiZXhwaXJlcyI6MTcxMDA5OTM4NywiZGF0YSI6eyJpZCI6MjczMzA5MDl9fQ==--a5c5e5d593918f526fda17f2bc94cf2a756ebf1d.gif' height='1' width='1'></p>