解决冲突
Merge branch 'master' of https://github.com/letbewith/Storage-for-WordPress

Conflicts:
	.idea/workspace.xml