changed profiles to users
Merge branch 'master' into dylan
Merge pull request #34 from mbathletes/andres

Andres
rearranged some if statements for security purposes. also added some of the views
Merge branch 'master' into dylan
Merge pull request #35 from mbathletes/dylan

Dylan