updates
Merge branch 'master' of github.com:geb/geb-talks

Conflicts:
	talks/devoxx/src/slides/02-basics.md