Simulation timer
Merge branch 'master' of github.com:amelim/RIP-2013-Final