edit edit
Merge branch 'master' of https://github.com/muminaydin/gittest

Conflicts:
	mumin.php