first commit
add iws file to git ignore
delete idea project files
Merge branch 'master' of github.com:zhaozhiming/Bushu

Conflicts:
	.gitignore
Merge branch 'master' of github.com:zhaozhiming/Bushu

Conflicts:
	.gitignore