1

1
2

2
Merge branch 'master' of https://github.com/jerryni/jerryni.github.com

Conflicts:
CNAME
3

3