pedantic newlines
Merge branch 'master' of https://github.com/chrisgw/progteam