new file:   img/autumn/leaf.jpg
	modified:   snowdown/test.js
Merge branch 'master' of https://github.com/liuzg459/gitworkspace

Conflicts:
	blog/snowdown/test.js
Merge branch 'master' of https://github.com/liuzg459/gitworkspace
	modified:   css/index.css
	modified:   index.html
	modified:   js/methods.js
	modified:   js/plugin.js
	modified:   js/public.js
	modified:   snowdown/test.js