void
Merge branch 'master' of github.com:jangel88/gampi

Conflicts:
	source/struct_cart_domain.h
Functions from header