added alternate hero and friendly colors
Merge branch 'masterfix' into assets
fixed power up asset bug
Merge pull request #33 from ranleung/assets

Assets