made jquery file a local instead of a cdn
fixed conflicts
Merge pull request #69 from mbathletes/dylan

Dylan