Updating talk
Merge branch 'master' of github.com:thejamesdempsey/are-emotions-christian

Conflicts:
	index.html