Initial commit
commit 1
merge jing master with local repo