update

replaced xpos ypos zpos to this->xpos_this->ypos_this->zpos_ in movement
Merge remote-tracking branch 'origin/master'

Conflicts:
	newlab5/lab5/shopper.cpp