moat changes. This
Merge branch 'master' of https://github.com/oinkina/metapoems

Conflicts:
	main.py
	main.pyc