change error to null
Merge branch 'master' of https://github.com/vastus/trainer
Merge branch 'master' of https://github.com/vastus/trainer
merging dir structure