added timer
Merge branch 'master' of https://github.com/batm-games/cdh2014

* 'master' of https://github.com/batm-games/cdh2014:
  Adding zebra to tileset32