comit for pull
Merge branch 'master' of https://github.com/leon196/MachineLearning

Conflicts:
	Library/CurrentMaximizeLayout.dwlt
	Library/assetDatabase3