Merge branch 'master' into gh-pages
Add Uri's talk
Update index.html
Update index.html

Added links to Shai's Description
Update index.html

Added talk description
Merge branch 'master' into gh-pages

Conflicts:
	index.html
stuff
Merge branch 'gh-pages'