Tim line 10
resolution!

Merge branch 'master' of https://github.com/ecm-demos/tc_rehersal

Conflicts:
	group_messages/message_log.txt