Merge pull request #60 from mbathletes/andres

Andres
Changed styling
Updated styling
Merge pull request #61 from mbathletes/orlandov

Orlandov
fixed delte bug
fixed conflict
Merge pull request #62 from mbathletes/dylan

Dylan