fixed formatting of all the files: This closes #12
Merge remote-tracking branch 'upstream/master'