Design, twitterboxer, rundens kamper
Merge remote-tracking branch 'origin/master'

Conflicts:
	kamper.php