on a bus
update CHANGES file
Merge branch 'master' of github.com:straup/privatesquare into trips

Conflicts:
	CHANGES.md