comments in globals
Merge remote-tracking branch 'origin/master'
Standardized headers in files so that it is clear who worked on what