manual merge
Merge branch 'task_389' of github.com:raniaashraf/mozzn into task_389

Conflicts:
	lib/mozzn/cli.rb