Merge pull request #63 from mbathletes/dylan

Dylan
Updated about me
Merge pull request #64 from mbathletes/orlandov

Updated about me
fixed front end bugs
Merge branch 'master' into dylan