Merge pull request #2 from magiczhao/master

add cpplint to fit currently used rule
Merge remote-tracking branch 'visenze/master'