pulling
Merge branch 'master' of github.com:weshack/study_buddy
pulling
fix merge conflicts
pulling changes
pulling changes
branching
Merge branch 'master' of github.com:weshack/study_buddy