Merge branch 'master' of https://github.com/sandeepgholve/design-patterns

Conflicts:
	.idea/workspace.xml