new file:   gameManageClass.rb
	modified:   combatPets_v1_1.rb
	modified:   userManageClass.rb
Merge branch 'master' of ssh://github.com/aaronlc/combatpets
 Changes to be committed:
	new file:   combatPets_v1_1.rb
	new file:   userManageClass.rb