initial commit
formatting
Merge pull request #1 from merbla/master

Formatting