alaki
Merge branch 'master' of https://github.com/alireza70/ML-project.git

Conflicts:
	NaiveMFSGD.py
	conf.py