Merge branch 'master' of https://github.com/SCass1986/spawncamping-cyril into master1

Conflicts:
	src/main/java/org/stephen/hashmap/GuavaCache.java