Initial import
Merge branch 'master' of https://github.com/linuxmagNL/GAE-Workshop-2

Conflicts:
	README.md