Merge pull request #55 from mbathletes/orlandov

Orlandov
included jquery to rid of athletics and academic views. fixed buggs in signin and activation. need to fix nav bar
Merge branch 'master' into dylan
Merge pull request #56 from mbathletes/dylan

Dylan
fixed bugs. wrote personal summary for our team. utilized jquery to rid of academic and athletics views
Merge branch 'master' into dylan
Merge pull request #57 from mbathletes/dylan

Dylan
Added some mutators
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov