now it works but not well :-(
now we finish the fundamental features
Fundmental functions have been completed
Merge branch 'master' of github.com:midwinter1993/JavaProject2