New placeholder images for buttons. Reset button.
fixed merge issues
Merge branch 'master' of git@github.com:BostonGameJams/goomba_lab