initial commit
formatted output
Merge branch 'local'