Changed formatting and Headers
Merge branch 'my'
Merge pull request #4 from HHSIDEAlab/master

Fixing formatting