Merge branch 'master' of https://github.com/scottlow/studygroup_server
Fixing conflicts.