Merge branch 'master' of https://github.com/jonguan/cmpe273-project1

Conflicts:
	LoadBalancing_Servers/serv1.js
	dbConfig.txt
Merge branch 'master' of https://github.com/jonguan/cmpe273-project1

Conflicts:
	LoadBalancing_Servers/serv1.js
	dbConfig.txt