CONFIG
A
Merge branch 'master' of https://github.com/reaganjava/project.git

Conflicts:
	src/config/server.properties
C