af
Merge branch 'master' of https://github.com/linh232323/maisondenguyennguyen

Conflicts:
	wp-content/themes/mystile/css/layout.css
add gateway payment method