Unit testing, added room_list. Comment code
Merge branch 'master' of https://github.com/asrivat1/DS_Final

Conflicts:
	server.c