Merge branch 'master' of https://github.com/fiddler-crabs-2014/ConsciousConsumer