GAE optimized
Merge branch 'master' of https://github.com/oinkina/metapoems

Conflicts:
	markov.py