fixing conflicts
Merge branch 'master' of https://github.com/kgawne/P2PCalendar

Conflicts:
	client/tclient.c
	server/tserver.c