Formatting all files
Merge pull request #2 from jwg2s/develop

Formatting all files