Merge pull request #1 from lefnire/master

Update my fork
Merge pull request #2 from lefnire/master

Update my copy
Merge pull request #3 from lefnire/master

Update this branch
Pet Egg Sprite Sheet and CSS
Merge pull request #660 from Shaners/master

Pet Egg Sprite Sheet and CSS
Merge branch 'master' into develop