added displaying number of the current wave
fixed merge conflict, displaying nbListsKilled
Merge branch 'master' of github.com:agouenee/ImacTowerDefense