fix conflicts
Merge branch 'SignUp' of https://github.com/akhoatran/CS169-AMASS into SignUp