edits
Merge branch 'master' of https://github.com/fmunoz92/base