0
Merge branch 'master' of https://github.com/mnmnc/MachineLearning

Conflicts:
	.gitignore