just committing
Merge https://github.com/sauravpatel/networks-calenderServer

Conflicts:
	client/exec/client
	client/src/client.cpp
	server/exec/server
	server/obj/calender.o
	server/obj/server.o
	server/src/calender.cpp
	server/src/calender.h
	server/src/server.cpp
	server/users/steve
	server/users/tim