Automated commit at 2014-12-11 18:15:23 UTC by middleman-deploy 0.2.4
Fix style sheet merge conflict