assets added
changed power up timer color to yellow
Merge branch 'masterfix' into assets
Merge pull request #30 from ranleung/assets

Assets