dont know, sorry
Merge branch 'master' of https://github.com/twirsing/kippen.git

Conflicts:
	KippenServer/config.xml
first try shake, so so