new model -- Paul's first change
Merge branch 'master' of https://github.com/rusko248/ps-master-Pam

Conflicts:
	Rusko_adventures/.DS_Store
jump is a bit shorter