before right errors
time corrected
Merge branch 'master' of https://github.com/vsilv/fp