new file:   3dturn/test.html
	modified:   css/index.css
	new file:   img/autumn/leaf.png
	new file:   img/autumn/leafold.png
	new file:   img/bg/4dff7135bf4f4a420e84d4cf1e2532c0.gif
	new file:   img/bg/7448c5449cef4fdc91b4ae30d5f3cf14.jpg
	new file:   img/bg/797a19d9f087257ddb4b38fc1dda250f.jpg
	new file:   img/bg/9b1df156c060e77cf42972ffd4b94cf9.jpg
	new file:   img/bg/u=2611132721,946617084&fm=23&gp=0.jpg
	new file:   img/spring/flow.png
	new file:   img/spring/springbg.jpg
	new file:   img/summer/summerbg.jpg
	new file:   img/summer/sun.jpg
	new file:   img/summer/sun.png
	new file:   img/winter/snow.jpg
	new file:   img/winter/snow.png
	new file:   img/winter/snow2.jpg
	modified:   index.html
	modified:   js/methods.js
	modified:   js/plugin.js
	modified:   js/public.js
	new file:   snowdown/test2.html
	modified:   index.html
	modified:   js/methods.js
	modified:   js/plugin.js
	new file:   js/test.js
	new file:   technique.html
Merge branch 'master' of https://github.com/liuzg459/gitworkspace

Conflicts:
	blog/js/methods.js
	blog/js/plugin.js

	deleted:    img/autumn/leaf1.jpg
	deleted:    img/autumn/leaf2.jpg
	deleted:    img/autumn/leaf3.jpg
	deleted:    img/spring/5e77acf16d7238de148179cd20abee45.jpg
	deleted:    img/spring/7c42ec53e528a62e376fdaef767e10a5.jpg
	deleted:    img/spring/a58b8a92904a7b649c2c834cd8cf6937.jpg
	deleted:    img/spring/spring2.jpg
	deleted:    img/spring/spring3.jpg
	modified:   js/methods.js
	modified:   js/plugin.js