revision twentythree
revision twentyfour
Merge branch 'master' of https://github.com/alextanhongpin/alextanhongpin.github.io

Conflicts:
	html/blog.html
	html/contact.html
revision twentyfive