Merge pull request #69 from mbathletes/dylan

Dylan
Prepared files for production
Updated
Merge pull request #70 from mbathletes/andres

Andres