resolved merge conflict
Merge branch 'master' of github.com:Sgtpluck/wait_list
Merge branch 'master' of github.com:Sgtpluck/wait_list
can now reset password
cleaned things up
styling
merge conflicts
merge
demo version
found the commented out part!
Merge branch 'master' into Elffers-master
adding photo upload on user reset page