update
Merge branch 'master' of https://github.com/frankcjwen/CJWUtils

Conflicts:
	.gitignore