Merge branch 'master' of https://github.com/scottlove/MessageProducer

Conflicts:
	.idea/workspace.xml