Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
add 404 page
fix encoding problem in 404 page
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge remote-tracking branch 'origin/develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/lucienzhu/lucienzhu.github.com
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'