no message
Merge branch 'master' of https://github.com/sasi98/Project2.0

Conflicts:
	src/gui/TrainingWindow.java