set up basic template
see if change works with git
can load an image
overlay logo image
Merge branch 'master' into fluffy-play-image-edit
Click to add logo
starting save
Merge branch 'fluffy-play-image-edit'