would this work -.-
Merge remote-tracking branch 'origin/master'

Conflicts:
	class/CartVar.php