Merge branch 'master' of https://github.com/ThomasChan/ThomasChan.github.io

Conflicts:
	index.css
	index.html

Signed-off-by: Thomas Chan <chenjunhao5818@gmail.com>
Signed-off-by: Thomas Chan <chenjunhao5818@gmail.com>