timer controller and model
relationship between user and timer
Factory Girl
squashed resource bug
fixed conflict
Merge pull request #36 from kunovsky/timer

Timer