Merge branch 'master' of github.com:mrpotatoes/coding-standard