Merge branch 'master' of https://github.com/Sayi/sayi.github.com.git

Conflicts:
	templete/atical-index.html
Merge branch 'master' of https://github.com/Sayi/sayi.github.com.git