6
8
11
Merge branch 'master' of https://github.com/ming42889/cavalier.git

Conflicts:
	cavalier/bin/.gitignore
11
add notepad
notepad menu
Merge branch 'master' of https://github.com/ming42889/cavalier.git

Conflicts:
	cavalier/src/lectureEx/DivisorTheadDemo.java
830