basic start-session
Merge branch 'master' into AG-chicago

Conflicts:
	start-session