update
Merge branch 'master' of github.com:KemingChen/IR

Conflicts:
	.gitignore