small
done with stylistics
fix merge conflict
Merge branch 'master' of github.com:fhinson/santa into sabar