add
初始化开发
七牛api
add
merge gispy

Conflicts:
	.gitignore