edit
Merge branch 'master' of https://github.com/ovidio43/firat

Conflicts:
	wp-content/themes/themeFirat/css/main.css