doi user group trong httpd.conf
add
Merge branch 'master' of https://github.com/namnguyen2312/wordpress

Conflicts:
	.gitignore
	wp-content/plugins/woocommerce/i18n/states/TR.php
	wp-content/uploads/2013/05/02-150x150.jpg
	wp-content/uploads/2013/05/02.jpg
	wp-content/uploads/2013/05/07-150x150.jpg
	wp-content/uploads/2013/05/07.jpg
	wp-content/uploads/2013/05/12-150x150.jpg
	wp-content/uploads/2013/05/12.jpg
	wp-content/uploads/2013/05/22-150x150.jpg
	wp-content/uploads/2013/05/22-300x300.jpg
	wp-content/uploads/2013/05/22-90x90.jpg
	wp-content/uploads/2013/05/22.jpg