Better css
Merge branch 'master' of github.com:cristirusu/demo

Conflicts:
	wp-content/plugins/test/styles.css