dfg
Merge branch 'master' of git@github.com:johnolos/fpg1.git

Conflicts:
	CalenderApp/src/ktn/Client.java
	CalenderApp/src/ktn/Server.java