talk update
Merge remote-tracking branch 'upstream/master'

Conflicts:
	LightingTalks/schedule.md
schedule with table
Merge pull request #4 from miracode/master

talk update