新建文件夹刷新成功
新建文件夹刷新成功
修改编码后
Merge branch 'master' of https://github.com/ProgramMonkey/File_explorer

Conflicts:
	src/com/explorer/MainActivity.java