everything done on frontend
Merge branch 'frontend-dev' of git@github.com:PenguinToast/HackUCSCApp.git into dev-server
Merge branch 'dev-server' of git@github.com:PenguinToast/HackUCSCApp.git into dev-server