maj resal

Signed-off-by: Haelle <pihaelle@gmail.com>
Merge branch 'master' of https://github.com/Haelle/EstebanConfigFiles