some minor linting
whitespace
fixes typoed class name
fix one-line merge conflict
Merge pull request #1 from ShawnMilo/master

some minor linting

Looks great! Thanks!