style change
Merge branch 'master' of https://github.com/zkdan/dad2
just for consistency
w
Merge branch 'master' of https://github.com/zkdan/dad2
style changes
Resolve merge conflicts