Stuff.
Merge branch 'master' of github.com:brunoripa/flask-gae-template

Conflicts:
	.gitignore
	app.yaml
	pkg_loader.py
	requirements.txt
	web.py