Added demo files.
Updated talk.
Solving conflicts.