reset again
Merge branch 'master' of https://github.com/dyslove123/2014_11_26