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

Conflicts:
	wp-content/themes/musician/.sass-cache/5211b15416612ae447cce3428b8b045953a4f81b/_variables.scssc
	wp-content/themes/musician/.sass-cache/5211b15416612ae447cce3428b8b045953a4f81b/all.scssc
	wp-content/themes/musician/css/all.css
	wp-content/themes/musician/css/all.css.map
	wp-content/themes/musician/index.php
.