Merge branch 'master' of https://github.com/hebaceous/study

Conflicts:
	src/test/java/redis/jedis/JedisTest.java