Finished formatting output
Merge pull request #1 from kevinkmckeown/master

Finished formatting output