Ups, screwed up with a framework
Merge branch 'master' of github.com:jrief/test-redis

Conflicts:
	README.md