.
Merge branch 'master' of github.com:nguyenthai2010/Musician

Conflicts:
	wp-content/themes/musician/css/all.css
	wp-content/themes/musician/css/all.css.map