Merge pull request #2 from bautistaI/routes

Routes
Update main.js
conflict solve