Added a lot of stuff that we dont remember
Merge branch 'master' of https://github.com/luc-luc/ferreteria