treci commit 0704
ignore commit
testcommit
gitignore commit
gitignore test commit
Merge branch 'master' of https://bitbucket.org/zola89/clientserverapp

Conflicts:
	.gitignore
	bin/client/CapitalizeClient$1.class
	bin/client/CapitalizeClient.class
	bin/client/ClientUtil.class
	src/client/CapitalizeClient.java
	src/client/ClientUI.java
paviljon 0904
paviljon 1004