Ran the formatter on all the files
Merge pull request #132 from awolfe9/Formatting

Ran the formatter on all the files