tweak
Merge branch 'feature/circleci' of github.com:sakai99/gae-ci into feature/circleci

Conflicts:
	circle.yml