fix(main): reorder the flow

increment the `$scope.pomodoro` first before decide whether the user should take a short or long break.
docs(*): fix typo
Merge branch 'fixes'