Sync github with local changes as of turning in work at 3rd quarter
Merge remote-tracking branch 'origin/master'