about
Merge branch 'master' of github.com:MichaelTong/michaeltong.github.com

Conflicts:
	about.md