change login button
Merge branch 'master' of github.com:gold9ine/MusicHarmony

Conflicts:
	FrontWebPage/MusicHarmony/views/layout/header.erb
' merge header
Merge branch 'master' of github.com:gold9ine/MusicHarmony

Conflicts:
	FrontWebPage/MusicHarmony/views/layout/header.erb