functional app
conflict solve
Merge pull request #3 from bautistaI/routes

functional app