Merge pull request #67 from mbathletes/dylan

Dylan
update
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #68 from mbathletes/orlandov

Orlandov
made jquery file a local instead of a cdn
fixed conflicts