Performed automatic clean up. (CR+LF line endings to LF) (tabs to
spaces) (final where possible) (Add override annotations)
Merge pull request #32 from duckdoom5/master

Performed automatic clean up and updated to CB 1.6.4 R2.0