merge joelostblom's edits
merge joelostblom's edits

lwjohnst86/studyGroup,QuLogic/studyGroup,QuLogic/studyGroup,lwjohnst86/studyGroup,sjeblee/studyGroup,linamnt/studyGroup,mbonsma/studyGroup,lwjohnst86/studyGroup,QuLogic/studyGroup,sjeblee/studyGroup,mbonsma/studyGroup,linamnt/studyGroup,mbonsma/studyGroup,sjeblee/studyGroup,sjeblee/studyGroup,QuLogic/studyGroup,QuLogic/studyGroup,lwjohnst86/studyGroup,linamnt/studyGroup,mbonsma/studyGroup,linamnt/studyGroup,linamnt/studyGroup,lwjohnst86/studyGroup,sjeblee/studyGroup,QuLogic/studyGroup,sjeblee/studyGroup,mbonsma/studyGroup,lwjohnst86/studyGroup,linamnt/studyGroup,mbonsma/studyGroup