added notes, committing changed files
Merge remote-tracking branch 'origin/master'