some changes
Merge branch 'master' of https://github.com/taschukMax/Java_Projects
aasdas