Changing variable names.
fixed merging issues and started working on the addition of services.
Merge branch 'master' of github.com:Seich/Hackathon-Migracion