，

，
，.

，
Merge branch 'master' of https://github.com/dayali/dayali.github.com

Conflicts:
	about.html
	services.html