first commit
Merge branch 'master' of github.com:HopeStudio/LISHAN

Conflicts:
	.idea/LISHAN.iml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	.idea/workspace.xml