Updated password reset and added error 404 page
Merge branch 'master' into andres
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