local para
Merge branch 'master' of https://github.com/Tarim8/tarim8.github.io

Conflicts:
	index.html