2014/11/14 styleguide
Merge branch 'master' of https://github.com/kcsi/styleguide