Comments and such
Merge remote-tracking branch 'origin/master'
resolved merge conflicts with comments