password reset intiated
Merge branch 'master' into dev

updated passwords
add supporter amount to challenges table
Merge pull request #30 from rasbabbo/master

added password reset
Merge pull request #31 from marklc44/master

caught buttons on challenge page working
Merge branch 'master' of https://github.com/mjminc/project2