Java7
Merge branch 'master' of github.com:Liuyu314/liuyu314.github.com