remove whitespace
Fixed merge conflicts; Added new contributor
Merge branch 'cesarandreu-whitespace'