a
Merge branch 'master' of github.com:freador/educartec

Conflicts:
	wp-content/themes/educartec/css/large.css
	wp-content/themes/educartec/css/medium.css
	wp-content/themes/educartec/css/small.css
Merge branch 'master' of github.com:freador/educartec