yes
Merge branch 'master' of https://github.com/joncunni/musicApp

Conflicts:
	albums.html
	css/style.css