Merge branch 'user' of https://github.com/CarterNelms/study-buddy into teacher
Merge branch 'teacher' of https://github.com/CarterNelms/study-buddy into teacher