Merge branch 'master', remote-tracking branch 'origin'
added more buttons to win/lose screens
merged