third
Merge branch 'master' of https://github.com/NikhilNanjappa/music

Conflicts:
	Gemfile.lock