代码
Merge branch 'master' of https://github.com/zhangzhige/Museum

Conflicts:
	.gitignore