colorpicture added
Merge branch 'master' of https://github.com/tiare/DrunkenEd
image in gameoverstate
conflict resolved