test commit
Merge pull request #6 from lukeaiken/test

test commit
whitespace
fixed merge conflicts