fixed instructor and meeting time
Merge remote-tracking branch 'origin/master' into matt2

Conflicts:
	.DS_Store
attemps to fix escape characters
fixed escaped characters
comments
comments and last touchup
merge