removed settings
Merge branch 'dev-server' of github.com:PenguinToast/HackUCSCApp into dev-server