Merge pull request #78 from herbatnik/master

warm up fix
Merge branch 'n' into nn
agenda change + trening plans changed