commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	design-patterns/abstract-factory/.classpath
	design-patterns/abstract-factory/pom.xml