Converted line endings from CRLF to LF
Removed trailing whitespace
Merge pull request #338 from jrtc27/whitespace

Cleaned up whitespace