Merge pull request #6 from sharlwong/sharlene

Changed salmon sushi and rice cracker graphics
Add ball type (as integer)
Revert Swayam's overwritten changes
Merge with Tianchi's changes