opened up the user controller so that users can reset their password
Merge remote-tracking branch 'origin/master'
wrapped the dirty hoe