working copy
stub imported
Merge branch 'master' of https://github.com/Tjorriemorrie/wolkie

Conflicts:
	.gitignore
	app.yaml
	index.html
	main.py