updated css styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/styles.css
	data/music.json
updated css styles
search.html
components
updated style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	components/components.html
updated components