testing

testing
change note.txt to no bom utf-8 format

change note.txt to no bom utf-8 format
Merge branch 'master' of https://github.com/springcalf/cplusplus_primer_4th

Conflicts:
	chap1/note.txt