audio commit
Audio is not playing...
Merge branch 'audio-branch'

Conflicts:
	data/data.json
	fragments/albums.html
	fragments/index.html
	index.html