alaki
Merge branch 'master' of https://github.com/hessamb/ml-project
Merge branch 'master' of https://github.com/hessamb/ml-project
Merge branch 'master' of https://github.com/hessamb/ml-project
alaki
Merge branch 'master' of https://github.com/hessamb/ml-project

Conflicts:
	Models/LinAlg.h
	conf.h