ucuncu
besinci
Merge branch 'slave'

Conflicts:
	index.php
Merge branch 'master' of github.com:denizobi/kampagit

Conflicts:
	index.php~