Formatted all files to the same standard
Merge pull request #7 from lordmat0/master

Formatted all files to the same standard