example change to demo conflict resolution
Merge branch 'feature-conflict-example'

Conflicts:
	index.html
added slide info about conflicts, and other techniques