add mor
add new mor
merge notmor
Merge branch 'addmor' into develop

Conflicts:
	morning.py