clarified time for no man plot summary
Merge branch 'iss3'

Conflicts:
	game/events-social.rpy