new talk on AppEngine
merge fix?
Merge branch 'master' of github.com:andrewwatson/Talks

Conflicts:
	README.md