Committer: Token <token@token-HP-ENVY-14-SPECTRE-Notebook-PC.(none)>

 On branch master
 Changes to be committed:

	modified:   WPScore/WPAllocator.h
	modified:   WPScore/WPLib.cpp
	modified:   WPScore/WPLib.h
	modified:   WPScore/WPNote.cpp
	modified:   WPScore/WPNote.h
	modified:   WPScore/WPPart.cpp
	modified:   WPScore/WPPart.h
	modified:   WPScore/WPPersistentTree.cpp
	modified:   WPScore/WPPosition.cpp
	modified:   WPScore/WPScore.cpp
	modified:   WPScore/WPScore.h
...

...
Merge branch 'lazine'
correct a grammar

correct a grammar
Merge branch 'master' into lazine

Conflicts:
	.DS_Store