added timer and fixed snape
Merge branch 'master' of https://github.com/IanWyszynski/Resistance