file2
Merge branch 'master' of github.com:zhaoge/Gallery into lee
file3
Merge pull request #7 from zhaoge/lee

Lee