Automated commit at 2014-12-14 19:02:43 UTC by middleman-deploy 0.2.4
Fix style merge conflict
Pictures added