Merge conflict!!!! mwwahahahahaa
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By vpcombo
# Via vpcombo
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  productorder
Revert "Merge conflict!!!! mwwahahahahaa"

This reverts commit 1d892e12596efda5a87d4c17e72a48bd6c166a23.
Revert "Revert "Merge conflict!!!! mwwahahahahaa""

This reverts commit 8fc1a64a1c8e2466dc72bffab7930e5ae2a45f9d.
Merge branch 'master' of github.com:hawaiianchimp/CSE135-Project

# By Bonnie
# Via Bonnie
* 'master' of github.com:hawaiianchimp/CSE135-Project:
  fixed login bug