fixed displaying win image
fixed merge conflict
Merge branch 'master' of https://github.com/agouenee/ImacTowerDefense