Merge pull request #25 from TAMED/staging

Map and Bug fix
I generalized the timer so we can record times and stuff. Right now it
tracks overall best and last times but once we get more levels we can
make it store times for all of them.