finished
Merge branch 'master' of github.com:huhu007/graduate2015