Added fps computation
Comment moved
Merge branch 'master' of https://github.com/repraze/quad-ninja