Merge branch 'master' of https://github.com/repentant/Sahiplendir

Conflicts:
	css/style.css