untracked bin
Merge branch 'master' of https://github.com/twirsing/kippen.git

Conflicts:
	KippenServer/bin/at/bakery/kippen/server/KippenServer$1.class
	KippenServer/bin/at/bakery/kippen/server/KippenServer.class