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

Conflicts:
	cavalier/bin/.gitignore
11