update 7/29
Merge branch 'master' of https://github.com/KasenJ/CommunityPython

Conflicts:
	code/util.py

Merge