yui
Merge branch 'master' of github.com:MeLoco1/JavaEdu

Conflicts:
	HomeWork/ThreadsTrain/.idea/workspace.xml
Win
Trains ready
Datamapper is not ready