.gitignore
Merge branch 'master' of https://github.com/mgorenstein/mechanicalpoet

Conflicts:
	.gitignore