Removed conflicts
KenjiW
Update
Merge branch 'master' of https://github.com/elsanfranciscano/elsanfranciscano.github.io