Fixed timer bug
Merge branch 'master' of https://github.com/nihilocrat/ggj2014_omen
Fixed rise time