merge
Merge branch 'master' of github.com:KleinShenCSE/NodeServerDummy

Conflicts:
	controllers/homePage.js