init
Merge branch 'master' of https://github.com/Lenic/lenic.github.io

Conflicts:
	index.html

init mycode
Merge branch 'master' of https://github.com/Lenic/lenic.github.io

Conflicts:
	index.html