commit
Merge branch 'master' of github.com:liuruoze/PlateSegmentation

Conflicts:
	.gitignore