iphands Merge pull request #18 from wodCZ/patch-1

CSS conflict fix [closes #15]

Latest commit ca664e8

Aug 6, 2015