Fixing regressions....
All conflict regressions fixed (I hope)
Merge branch 'master' of github.com:miguelSantirso/one_arrow