Merge remote-tracking branch 'hdao/master'
git results in error so I'm testing
merging
Merge remote-tracking branch 'Aaron/master'
need to solve the conflicting return statement of login and registration