first from company pc
Merge branch 'master' of github.com:terrilltang/test_for_myself

Conflicts:
	fade-image.html
	index.html
	slide-image.html
	wave.html