fixed bugs sing_up and log_in now working
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into Alexis