First commit
Merge branch 'master' of https://github.com/consolelog/rock-songs-task

Conflicts:
	.gitignore
	README.md
	classic_rock.json
	index.html
	style.css