modified:   README.md
	README.md~
	modified:   README.md
Merge https://github.com/nathanialrowe/python-patterns

Conflicts:
	README.md

	modified:   README.md
	modified:   abstract_factory.py