java enum
Merge branch 'master' of https://github.com/abingsky37/abingsky37.github.com