merged in eclipse
edited in eclipse
test commit
Merge branch 'HEAD' of https://github.com/willi-berger/jedis-demo

Conflicts:
	src/test/java/com/alturos/adcup/AppTest.java