Merge pull request #68 from mbathletes/orlandov

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

Dylan
Prepared files for production
Updated
Merge pull request #70 from mbathletes/andres

Andres
Updated migration.
Merge branch 'master' of https://github.com/mbathletes/mbathletes into andres
Merge pull request #71 from mbathletes/andres

Andres
fixed db error
fixed admin user bug
Merge pull request #72 from mbathletes/dylan

Dylan
Grammer correction
Merge pull request #73 from mbathletes/andres

Grammer correction
fixed bugs
Changed title on homepage
Merge branch 'master' into andres
Merge pull request #74 from mbathletes/andres

Andres
Update to main page title