Added images and changed settings to be backwards compatible
Merged conflicts
Doing barrel rolls and adding new assets for Mike
Merge pull request #470 from jaypoulz/jp447

Jp447 -- Doing barrel rolls. (and adding new assets)