Added a formatter
merge conflits
Merge pull request #2 from VicV/formatter

Added a formatter