first time2
Merge branch 'master' of https://github.com/l6/l6.github.io

Conflicts:
	index.html
Merge branch 'master' of https://github.com/l6/l6.github.io
first time2