Updated gems
Merge branch 'master' of https://github.com/volmer/music

Conflicts:
	Gemfile