css changes on server
Merge branch 'master' of git://github.com/calin-marian/circu.ilie

Conflicts:
	wp-content/themes/thingreal/style.css