Merge pull request #22 from kpham13/Scoring

Scoring
update hero images
update upstream
update animation
Merging from upstream master after refactoring code
Merge pull request #23 from TinasFu/newAnimation

New animation
Quick code clean-up