update from master + update gitignore for notes file