* commit before merge
Merge branch 'master' of https://github.com/yansh/MoanaML/

Conflicts:
	config.ml
	main.ml