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

Dylan