Commitment
Merge branch 'master' of https://github.com/rji2hv/CS-1501-Final

Conflicts:
	server.js