初始化
增加test文件
修改test
test增加一行aaa
Merge branch 'master' of git://github.com/naiyi/test

no reason. just for test.