lnanglin/lnanglin.github.io — pull request #4 by lnanglin (2014-08-06 20:26:08+00:00)
Title: Merge pull request #3 from lnanglin/master

merging master with dev