Woah!!! Gameplay!!! It might actually be considered a game now!!
Merge branch 'master' of github.com:wlcsc-acsl/kittehvpenguin

Conflicts:
	kittehvpenguin.rb
	kitty.rb
	player.rb