added timer and counter but not like they work
Merge branch 'master' of https://github.com/elany/Memory