Welcome = root
Merge remote-tracking branch 'origin/master'

Conflicts:
	byh/app/pages/band/bandDetailController.js