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

Conflicts:
	wp-content/themes/musician/.sass-cache/73f5f36a4c047435ccc86369dbf681ce7b00c12a/_custom.scssc
	wp-content/themes/musician/.sass-cache/73f5f36a4c047435ccc86369dbf681ce7b00c12a/_style.scssc
	wp-content/themes/musician/.sass-cache/73f5f36a4c047435ccc86369dbf681ce7b00c12a/all.scssc
	wp-content/themes/musician/css/all.css
	wp-content/themes/musician/css/all.css.map
	wp-content/themes/musician/header.php
	wp-content/themes/musician/inc/load_credits.php
	wp-content/themes/musician/js/class.credits.js
	wp-content/themes/musician/js/custom.js
	wp-content/themes/musician/sass/_custom.scss
	wp-content/themes/musician/sass/_style.scss
	wp-content/themes/musician/sass/all.scss