Merge branch 'master' of https://github.com/jerrydotlam/jerrydotlam.github.com
Merge branch 'master' of https://github.com/jerrydotlam/jerrydotlam.github.com