wip
Merge branch 'master' of https://github.com/AndyMoreland/cs-244-project

Conflicts:
	src/main/java/config/GroupConfigProvider.java