for @myles with non-flammable materials
zeppelins
Merge branch 'master' of github.com:straup/privatesquare into trips

Conflicts:
	CHANGES.md